Budget and wattage needs?
At this point I'd say definitely you should be going all valve and ditching anything solid state or with built in effects.
My amp preferences are probably pretty similar to yours, most of the time I play pretty clean and never with horrendous amounts of distortion.
I use for practice and recording a Fender Champion 600 reissue, it's a 5 watt all valve little thing, but it sounds fucking beautiful (though you will need a good overdrive pedal to get it to dirty up a bit, it doesn't really ever overdrive itself too much) I love this thing, but it's not the most versatile amp ever made, in fact it might be among the least versatile amps ever made.
A Peavey Classic 30 or Peavey Delta Blues would probably be a decent shout for you as well (and a scout for a 2nd hand Peavey Classic 20 is worth a go since they don't make them any more, BP's got one and won't sell it to me, I've wanted it for about 5 years). With a bit more cash I like the Fender Blues Junior. Orange's valve amps tend to always be pretty awesome.