Save yourself a fortune: do not upgrade until you got your foundation right! See my post in the Tweaks forum.
I have a similar set-up. The problem is (i) internal resonance/ vibration of the equipment itself (ii) unclean power.
Solve (i) with proper bases/ pucks and (ii) with a power...
Trial and error, very system AND taste dependent! In my experience it is best to stick to cable looms by one manufacturer. First priority are power cords. But even more important is the "foundation". See my post in the Tweaks forum.
Enjoy your search, it is fun.
Over the last 10 years I built a Hifi- system that reproduces classical music in a way I find very natural. I am in the lucky position that i can compare live performances with home auditions. Fortunately, upgrading did not cost me an arm and a leg as I started out with superior products in the...