I'd think a Vantage would suit most of your needs and it will do plenty that a labscope can't do (graphing). I'd learn to use the Vantage really well before I considered getting something else.

Alan Login to read more.