I have tons of tube amps, solid state amps have improved a ton the last decade. The Katana and Vox VTX series are both fantastic IMO.
I was going to get a VTX when it came out but I never sold my older Valvestate so I've still got it.
I'd say go try the solid state amps next to whichever tube amp you like and see if the tube is really that much of an upgrade. The solid state amps have 100s of effects built in as well which is nice.
If you're fixed on Tube, the best value IMO is the Ibanez TSA15 head with a Vox 212 cab.
I've got the TSA30 and loved it so much I got the TSA15 as well (does 5/15 watts).
You could also do the Katana Head and the Vox 212.