OP,
Since you only asked about CD, I’ll limit my comments to that:
You did not list a price range for an upgrade, but here are some:
(1) Under $1,000 Audiolab 6000 CDT
(2) Under $2,500 Jay’s Audio CDT2-MkIII
(3) Under $5,000 Jays Audio CDT3-MkIII