The question has been posed many times before. I will respond as I have in the past.
I would change nothing with the component system. However, living in the overpriced and overrated suburbs of NYC, with extraordinary real estate and education taxes, my listening room in my small home is the untreated living room, on a suspended floor system. If I move out of the area in retirement or otherwise hit the numbers big and stay, I would have at least have a dedicated treated trapezoidal listening room, possibly designed ground up with a solid foundation, no parallel surfaces, vaulted ceiling rising front to back, and four dedicated 20 amp lines from a separate breaker. Oh … to sleep, to sleep, per chance to dream (note I left out the die at my age).