What are my options for music files, CD rips, and a DAC all-in-one solution?

I’m reviewing my digital chain and think it could be improved.

My current set up is this:

• Rega Aethos amp (because of my analogue chain)
• M-DAC Audiolab
• Marantz CD player
• Ripped CD files and other FLAC/WAV files converted to Apple Lossless and stored on an external harddrive. This is then managed by iTunes and connected to the DAC via a USB cable from the Mac.
• Sonos for streaming my ripped music collection and internet radio.

My ideal scenario would be an upgraded DAC that could rip CDs and stream music services/stored files. Whether that exists or if I’d need a different unit for ripping/storing CDs I don’t know. I’ve mainly focused on my analogue chain up to now but want to focus on the digital side and improve what I have.

I’ve heard good things about Naim, but don’t need another amp. Keen to hear the thoughts of members here who are digital first.