Upgrading digital side

I currently own a Jay's Audio CDT-MK2 CD transport and a Holo May KTE DAC.  I also stream (mostly files) with a Raspberry Pi (Roon and Audirvana software).   These feed PrimaLuna EVO400 preamp and amp and Devore Gibbon speakers.

I am  looking to upgrade my entire digital side.  I have an extensive CD collection that I will continue to listen to as well as thousands of files.

My budget is around $20,000 and I prefer new equipment.

So far, for DACS, I have been looking at the Grimm MU2, Bricasti M21, Mola Mola Tambuqui and the DCS Lina.  For server/streamers, Aurender N200 or N20 and Innous Stream 3.  I know that the DACS I mentioned also stream, but I'm not sure that I want to be completely tied to Roon or Audirvana.  I like the idea of internal storage for my files.

Finally, I am also considering the Luxman D-07X SACD player, which has a USB input where I would connect a streamer.  I'm wary of the quality of the DAC in the Luxman, especially for streaming.

Any advice on the best combination of the above (or something I haven't looked into yet) would be greatly appreciated.