If that really is your whole system then you have a lot to do before even thinking about changing any of those components:
PHT, ECT, HFT
Since you are 90% vinyl the best way to understand what I'm talking about, get some Synergistic Research PHT and ECT. My preference is Black Widow and Green Dream https://highend-electronics.com/products/synergistic-research-pht-phono-transducer
Try these and then when you see how much improvement you can get for hardly any money you can move on to a set of ECT, then HFT. Throw in a couple Blue Quantum Fuses and your system will be transformed from flat to holographic a lot more and for a lot less than any of the components you're currently considering.