Dither either of those amps would be a step up from what you had.
Ive had a little Mesa Subway Rocket, 20 watts tube, real simple little amp for about 15 years. I dropped out of a band I was playing in. But they would call me to sit in occasionally so I brought this little amp. 2 guitarist replaced me cause Im so badd ass, LOL in my own mind, but one of them had a Marshall Solid State half stack, I dont remember the model number, well I set my little Mesa on a chair next to his, he was laughing, what are you gonna do with that little bread box. It was a large club so I basically set the controls on my little amp at 5 and used the volume control on my guitar to regulate the distortion, by the end of the night the other guy had dimed that half stack out trying to run with my little amp.
I think you will love a tube amp.
Learn to crank the amp, and use the volume control on your guitar, if you set it up right, you can go from clean to mean with just your guitar volume control and use your guitar tone controls. SS amps just tend to be distorted or clean, there seems to be no in between.
Have fun with the new amp, you cant go wrong with either one.
"A winks as good as nod to a blind man"