Good one-box CDP or good DAC?


I have a McIntosh MCD 205 changer that makes great music. However, when I sit in the sweet spot to do some critical listening......I feel I could use a bit more. My question is: in the 2K price range (new or used), should I go for a one-box CDP or a DAC and use the 205 as a transport, in order to get that extra notch of emotionally moving sound?

BTW: I am keeping the 205 regardless because I want this MAC changer to remain in the mix, so selling it is not an option. Thanks,
pardales
Audionote makes two CD players, at $1500 and $2500, both with tube output stages, I believe. I've not heard them, but will soon. Might check jcaudio.com. There are favorable reports on the Cary 308, and the Cairn CDP, both around $1500.
I know this is above your price range, but I would recommend an audition with the Resolution Audio Opus 21 ($3,000). I chose it after carefully auditioning the Wadia 301, the Ayre CX-7, also compared the Naim, the Krell, and the Sim Eclipse. I previously owned the Theta Pro Basic IIIa with Theta's transport.
Well, I am awaiting an MSB Platinum Plus. I am going to give it a try and see how I like it.