I have B&W 802 and, as I am sure you know, to see their full potential you need very powerful amplifier. After many, many combination I am immensely happy with Joule-Electra preamp and Spectron amplifler.
Keep your current CD Player and later on go to Dedicated Music Server (or your general computer) & Stand Alone DAC combination - also depending on the budget you can achieve extraordinary performance. Don;t invest a penny in new CD Player - its dead end. There are more and more hi-rez music avaialble and CD Player is useless here.