Pre-Amp Match

I'm looking to replace my conrad johnson CV12L pre amp. Although it has a beautiful, lush sound which works very well with jazz and standards, it sounds less so with rock which comprises half of my cd collection.
My question is that I'm looking for a pre to replace the CJ, $1K range, that would be less old tubey sound but retain its tube character. Looking at makes such as TAD, Rogue, Cayin, or similar. One concern is that I will go in the other direction creating an overly bright, forward sound.
Considering my system components any opinions, advice or alternatives would be greatly appreciated. Thanks, Dave
System:
CJ PV12
Ody Stratos Amp
GMA Europa Speakers
Anti Cables
MAC Silver ICs
Denon 3901 CDP
Wadia IDoc
Dac2