A now deceased friend who was very wealthy built a gorgeous home and began setting up a very fine system with MacIntosh pushing the power. I don't remember all the peripherals but it certainly was big bucks all the way. He was never happy and asked me over for some advice. OMG, it was horrible!
People who live in glass houses should never seek great sound. The entire front of his living room was thick plate glass 12 feet high and probably 40 feet across. The music he enjoyed got lost chasing each other around the entire room. Much against his partners chagrin I told him to have heavy drapes installed that he could close when he wanted to sit and listen. He did what I said and they both hated it but he invited me back after the installation. You can't have your cake and eat it! They wanted to have the view while listening. When he drew the drapes, probably about a $20K install, his system came to life and became fully satisfying to both of them and me. The moral is, before you go spending gobs of money fixing your system, spend some time and effort fixing your room. Very possibly you will find it Fugly but it sure could sound way better.