Frankly, I wouldn't give my advice any weight. I freely admit I don't have a clue when it comes to audio.
Change the CDP. Change the Amp. Heck, you might as well chenge the drapes while you're at it.
Now, if I could just get this mizzen mast in place...