For high-powered tubes I'd take a serious look at the Art Audio Jota, and they also have a new and supposedly even better amp that I don't recall the name of. Check out reviews on Soundstage!.com, and you may even consider emailing Srajan Ebean from GoodSound!.com who is very familiar with the amps and may have some valuable info. for you.
On the solid state side you might be able to find a used McCormack DNA-2 LAE(Limited Anniversary Edition) that is said to be one of the best amps ever made--of course that's always relative to personal tastes and equipment. I think there's a reprint of a review from one of the mags(TAS?) on Audioreview.com if you're interested in more info. I bet you could buy it and if it didn't work sell it at no loss given the reputation of this amp. Best of luck.
Tim