Rip Cds to flac or dsf. Use something like piCorePlayer or your Node 2i and invest in an amazing dac. Tried Node 2i and preferred picorePlayer/LMS flexibility. I'm looking for a good DAC now too.
Happy to point you right direction if you need help ripping Cds and SACDs. Have over 3000 CDs as well along with 500 SACDs and bunch of blue ray audio. All ripped and available via my phone app. Super flexible and then add Tidal/Qubuz integration. Works pretty well.