I discovered in my messy audio room that ALL audio system that are already relatively good are better, way better than we think; we underestimated what we have and spend money on new electronic components, instead of addressing, the vibrations-resonance controls, the acoustical treatment of the room, the electrical embedding of the system in the room and in the house, and others simple tweaks to decrease the noise floor...
Most of the times we think about upgrading with the wrong idea, but transforming the potential of what we already have is the right path of an audiophile; anybody can buy something that will create the real or false illusion of an upgrade; real, because a 100 bucks amplifier is way less good than a 10,000 one for sure, but an illusion tough, because the same guy will never know how good was the sound of this 100 bucks vintage mythic amplifier (mine is) in an optimal embeddings...
My room is messy indeed, my audio system low cost, but the sound is absolutely not messy, and cost me a lot of thinking and times...