You're already on the right track with the amps you stated. Out of those, I would go for the new Marshall and it's matching cab. I don't have any personal experience with it, but from the clips and videos and reviews I've seen/read, it is an amazing amp.

Some other amps you might want to check out...

- Peavey Windsor (it's a single channel amp, but has lots and lots of tones tucked inside. Plus, you can't beat it's price!)
- Peavey 6505 or 6505+ (formerly the 5150 series)
- Mesa Boogie Stiletto (I believe it has more of a Marshall/British vibe than the rectifiers)
- Traynor YCS100H
- Carvin and Laney also make some great tube amps, but I have no experience with either company