your room is difficult but can be overcome...the speakers are way to close together and the glass bounces highs....nevertheless things can be improved...I'd work on the room and get the power supply clean before spending any dough on components since you will hear these improvements...then I'd start with either better source or better speakers...people debate endlessly over whether source or speakers comes first...also I am a tube man.
good luck...it's a fun hobby if you keep your focus on music listening not listening to components.
Larry K