I think using CMT340s as surround speakers would be overkill. I would be looking at Ascend CBM170s for that.
I would avoid all-channel stereo, which will never sound right. Most recordings are meant to present the sound stage in front of the listener, not all around them.
Given the acoustic of your room, you really ought to measure the frequency response at your listening position. Get one of
these, then install
this software on your PC (it's free), and then do a measurement sweep. This will tell us exactly in what areas there is most room for improvement in your system.