I can see that it probably won't be too far off that I lose the CDP altogether, I really like the look of the Naim DAC and Chord QBD76.
Then again, many manufacturers seem to be moving to allow use of the DAC in CDPs.
I'd love to get my hands on the new Esoteric K-01 or K-03 CD players which have dual mono 32 bit DACs with 8 or 4 chips respectively as well as USB input capable of 24bit/192khz, but it looks like they are going to be prohibitively expensive.
At this stage I thin you should modify the DAC or look to purchase a higher spec DAC.