Got to thinkin' about a new guitar amp this year. Currently running an Orange Dual Terror (30W) into a marshall 2x12. I play a modified jazzmaster at the moment (custom pickups- basically a supercharged jazzmaster pickup) with an old RAT2 as my main distortion.

Looking for something with a bit more headroom than the Dual Terror, it tends to distort quite early on, it sounds really nice, but at times I'd like a cleaner sound with more volume.
In terms of overall tone I'm a big fan of the guitar sound on Drive Like Jehu/Hot Snakes- overdriven but quite focussed at the same time.

Any recommendations?