If you listen to mostly records, then the turntable/cartridge is the first thing to do. I say that since I have the Rega 6 with their MC cartridge and would consider it very good, but it's "low" High-end. I listen to albums a only few times a week, so it's fine for me. I put most of my money into digital as that is what I listen to most.
However, if you listen mostly your CD player, then burn your CD's to digital (any of the Aurender's that burn would be great with your system). Bluesound Vault would be a second choice based on your available money. I went from Bluesound to Aurender. I love still having my CD collection yet being able to manage it just like a good streaming service - playlists, pick and choose, search, sort, etc.
Just one person's opinion of course.
You didn't mention streaming per-se, so I won't either.