First of all; if you're happy with what you already have, I wouldn't worry too much. Try not to get too "anal" about having the "right" equipment... becoming a gear-geek can tend to be counter-productive!
Anyway:
Am not a fan of "modeling" amps, so as a future (?) upgrade, I would recommend the Laney Lionheart series for amplification... great build-quality, a retro-look, and excellent basic clean and/or overdriven tube (valve) sounds.
Also, in my eyes there's no need to go the overpriced "vintage-route", when in search of a fuzz-pedal (or anything else for that matter)... there's plenty of modern-day clones that'll do the job just as well (and in many cases better!). For over-the-top fuzz, I've got a Mosrite-clone from Ashbass called Fuzzbrite (as opposed to the original Fuzzrite), which I got of Ebay for a sensible amount of money.
(e)