Looking for a new DAC streamer/server combo

I have a Sony HAP-Z1 that gets good reviews but limited to the internal DAC. There’s a lot of variation in sound quality that could be a product of the red book CD’s loaded into it. I’m curious how my CD’s would sound streamed through another DAC. I also have a McIntosh MB 50 streamer that I feel is very underrated. I like how the DAC sounds when streaming. The MB 50 also has an option to use an external DAC. 
My CD’s are burned to an external hard drive that I believe can be connected to an independent DAC. 
Any DAC’s you all think mate well with CD’s?
Any server suggestions to use with an external DAC?

I’m also open to moving on from the MB 50 for the right all in one solution. 
Budget: + - $4k

Speakers are B&W 803 D2’s which I feel are pretty revealing and aren’t too kind to poor quality recordings or mastering. 
Thanks for the feedback!