MANY CDs.
in addition to whatever you do, I think you should get yourself a CD changer. You don't need to spend a lot just to have an enjoyable unit.
I researched, asked advice, tried this and that, finally found one I really like the sound of
Onkyo, Integra CDC-3.4.
https://integraworldwide.com/Products/cd/cdc-3.4/
Now going for a changer that also plays SACD’s. This Yamaha has 4 DACs, I just bought one, will keep the favorite in main system, use the other in my office.