something i've just learnt might help you make a decision. over the last three days my company has run a training course at my premises run by Frank Massey.
Something that came out of this is quite simply that a car is a large computer on four wheels, with this in mind the electronics are nothing new to the electronics industry, although they are to a lot of us, and a lot of what we are trying to do, ie check pulses, waveforms, etc has been going on for years within the electronics industry, and so everything we need for this can be found within that section, leads cables, clips and so on from people like Radio spares, and Maplin, at a far less cost.
with regards to your scope myself and my staff have spent the last days working with a FLUKE 196c scope, Its not the cheapest approx £2000.00 BUT it will do EVERTHING you want and a lot more besides, although you will have to read the manual, and is future proof.It has a fast sampling rate 100hz. and will pick up signals that a lot of the slower kit cant, and so aid diagnostics.
As a lot of sensors now and even more in the future operate at very high freq, at lot of scopes cannot pick up and display this, and although i have spent a lot on kit, pms100, sun.sts1500.vantage etc etc, this kit knocks spots of them. and has shown us many waveforms that i did not know existed.