Preamp recommendations up to $2000


Hi everyone. The upgrade bug has reared it's head again and I'm starting to look for a better preamp. My present system is: Audio Note CD-2, Mapletree 2A SE pre, Edge G4 amp, and GMA Pico Executive speakers. I listen to mostly classical, with some pop/rock.

I don't have the audio vocabulary some of you do, but I guess I'm looking for a more open sound with a little more presence. I also wouldn't mind if the bass was a little fuller.

Although the Mapletree is a tube preamp, I would like all suggestions, including SS.

Thanks!
xrayz
Check the "goN" for the following:

SS
Jeff Rowland Capri S preamplifier with phono card

Tubes
Conrad Johnson Premier 17LS line stage preamp
Shindo Aurieges L
Hovland HP-100 with mm and mc-7 phono
Post removed 
Audio Horizons TP 2.0 or 2.1
Lamm LL2
Supratek Chenin.
All used of course and yes if you could stretch that budget another $500 you'll be well rewarded.