In my experience of constant dissatisfaction for my system, when i decided to tackle the system/room problem instead of buying a new upgrade, i experimented with acoustics with more fun, no money invested (homemade) and after 2 years i was in ectasy...
I did not need to upgrade since save to replace deficient parts or create better synergy(low cost upgrade)...
The race for upgrade is mostly created by acoustics basics knowledge ignorance entertained by marketing strategy about gear piece...
Guess why many dont like to hear that ? 
The most important part of audio is not buying a piece of gear, never mind his price, but knowing or learning how to make it work at his best possible peak acoustics working level ...
My best to you ...
@mahgister I have just moved and my new listening area is much better theoretically than the previous space and out of the gate the system sounds better, but the new room has its own / new problems acoustically.
I know it is not the gear. And I have you to thank to some extent for constantly driving this point home.
I will not spent a penny on new gear - I’ve got to get the room right to get to next level.