You have some serious sounding gear. Must have cost quite a bid. These things are a bit personal. Just need to tweak the system to your own liking.
I just upgraded my system. I was using an old Marantz PM55SE with an old Eclipse CD Player. They were very old, but there were not too bad. I was using a pair of TDL Nucleus 1 bookshelves. However, these did not have enough bass for my living room because I moved to a new place. Hence an upgrade was necessary (excuse for shopping). That's why I put a new system in place. Quite happy with it.
All I am missing now is a tuner. But I'm in no hurry. I like to shop slowly for these things.