You've got a tough situation, especially with the glass wall on the right - that is very reflective. The masonry wall is probably less so, especially if the masonry has any texture.
The good thing is that you can experiment with acoustics very inexpensively. Find some pillows, cushions, or even a thick bedspread/comforter and position them on each wall, halfway in between the speakers and the listening position. The items should be at listening ear level. This is the primary reflection point. (If you've ever played pool or billiards, think of calculating the angle of a bumper shot.)
My bet is this will improve the sound considerably.
If it works, the hard part is translating the experimental placement into something more suitably permanent. However, there are companies that sell room treatment materials. Continued experimentation will probably improve things further.
I wouldn't worry about changing any equipment until you've settled on a final configuration for the room acoustics.
The good thing is that you can experiment with acoustics very inexpensively. Find some pillows, cushions, or even a thick bedspread/comforter and position them on each wall, halfway in between the speakers and the listening position. The items should be at listening ear level. This is the primary reflection point. (If you've ever played pool or billiards, think of calculating the angle of a bumper shot.)
My bet is this will improve the sound considerably.
If it works, the hard part is translating the experimental placement into something more suitably permanent. However, there are companies that sell room treatment materials. Continued experimentation will probably improve things further.
I wouldn't worry about changing any equipment until you've settled on a final configuration for the room acoustics.