cd player is dying, need suggestions please

Hi all, so my cd player is on it's last leg and I am in need of an upgrade. I listen mostly to redbook cd and have little interest in computer audio at this time, but I would like to have an option to go to computer audio with whatever I end up replacing my cd player with. I have done a little research and I have the ps audio perfect wave transport and matching dac high on my list. Also I like the idea of a music server and the Music Vault music servers are also high on my list. What I really would like is to get rid of all my cds and store them in one of these two units, what do you think would be my best option, thanks everyone