[nichomachean]

I would ask what kind of budget you're looking for?

Overall, in terms of amp, for the most legitimate sounds (both clean and overdriven), you can't be tube. There are plenty of boutique craftsman creating wonderful amps across a range of sounds and needs. Bad Cat amps, for example, have great class A overdriven sound and crystal-clear cleans. ENGL, on the other hand, makes face-melting, high gain monsters for the metalheads and shredders out there. I think tube amps are worth the investment, even if they are pricey.

In terms of guitars, most companies make great guitars, and tone is a matter of many things, including the wood combinations in the neck, fretboard, and body; which electronics you place in the guitar, and scale. In terms of your current guitar, I am skeptical things like fret buzz and high action cannot be adjusted (it sounds like your repair guy doesn't seem to know his stuff). I play an Ibanez S with EMG active pickups as my more "metal" guitar (it has exceptional clean sounds as well), and stick to a Dean Evo for my more classic rock, Gibson-Les-Paul-style guitar.

Solid state is great on a budget, but all-in-all one will not find the same tone from it as tube circuitry.

Just my 2 coppers.