Speakers or amp to be upgrade?

So, you have 3 systems setup?
Does your list order indicate the speaker/amp match up?

If you don't want to change the way your speakers sound now, it's pretty simple.  You don't need to upgrade anything. You either want to change the sound, or you don't.

It’s not about opinion. You change up the weakness in the chain. What will bring the band closer to standing in your room? Right or wrong not opinion. Stay focused on delivering to your ears exactly what your source provides. Everybody wants to change the sound to something they initially like better but over time your brain knows what is real and you will listen longer , louder if you stick to the path. No opinions! 
 I have observed over time that for many the preamp, the brain, or control center is there weak link.

Why change anything if you love the way it sounds now?  The hobby doesn’t have to be an endless pursuit of something.  Get to where you love it and be done with buying stuff.

One of my most significant upgrades ever was my c-j preamp...   I didnt need better speakers, they sounded much better as my electonics improved....