Whats your budget?

I would consider a good DAC.

Without knowing your budget here's a few CDP's under $2k
Rega Apollo SE a great all around player that does everything well, Cambridge Audio 840c, Rega Saturn. For a warmer sound and SACD play consider any of the high end Marantz players higher than the SA8003 which i found less detailed and muddier than the ones named above.

For DAC's consider the Van Alstine new vision DAC that also plays hi rez music and has a tube like sound, Bench Mark DAC, Bryston DACs to name a few.