That sucks, PJ. \ I own a CDP-2, but I'm afraid I haven't much helpful advice. How does one determine if a unit is a CDP-2 or a CDP-1 that's been upgraded?
Tangentially, I will say that with oh, about 15 minutes of comparison time, the CDP-2's DAC is noticeably better than the one HeadRoom puts in their Balanced Desktop. I have a tin ear, so it might be that others won't hear it this way. It's also possible I might revert my opinion. I tend to doubt it, though. The CDP-2's soundstage is amazing.