Not sure how Spitzer fits in your classification scheme, Drbuzz0.

It may be said to occupy a niche in the IR that is complementary to that of the HST in the optical ...

Also, how about Galex? Not at all a competitor to the HST (so different in so many ways), but it does have "basically stuff with a lens and CCD and optical sensors, as opposed to a scintillation imager or something similar. And intended for broad use for stars, galaxies etc etc."