Upgrade the room first. There's always something you can do to improve the room. It plays the biggest roll in the system's sound signature.
Many here know this but really hit a wall (pun intended) and never fully exploit the room's potential, myself included.
I learned by sheer accident after years of believing I had done enough.