What CDP to replace my AA Prima ?

I mainly listen to classic & contemporary rock and contemporary blues.
The Prima is a good CDP but I need more for the quick and dynamic music that I listen to. I need more body, slam, musicality and better PRaT. The Prima CDP, coupled with my AA Prima Integrated Amp, seems to tame most of the inherent hot recordings that classic rock is known for. I don't know how much the tube in the preamp section of the amp and the tube in the CDP affect the tizziness individually but combined they do a good job. The Prima CDP ran through my Rotel SS system was more tizzy. So I am not sure if the new candidate should also be tubed.
The only other CDP that I have used is the NAD 541i which is to dark and muddy sounding.
I would like the new candidate to have a good transport and digital outs. Later, I would like to experiment with outboard DAC's when the 'bug' bites. Finally I would like to spend around $2000 in the used market.
My system consists of an Audio Aero Prima Integrated Amp, Soliloquy 6.2i speakers, M. Wolff Source PC for the CDP, Kimber ribbon speaker cable and Z Squared IC's (gold and silver mix).

Thank You