Your original configuration is fine.
Have you considered the Factory Outlet deals?
You may have to wait a bit longer for your speaker choices to come available, but the cost savings is phenomenal for the product that you get.
The 'blemishes' that are supposed to be on the speakers are often so unnoticeable that you laugh yourself silly. Here is a link to the 'blemishes' on my Factory Outlet deals:
QS8 scratch
same qs8 at a distance
the only flaw i can find on my vp150

As for comparisons of M22s and M60s, check out my post from yesterday in which i gave some links to several posts here in the forums on the tower speakers.
I did however have the opportunity to audition both the M22 and M60s and although our basement room is also not very large, the M60s had a presence that the M22s simply cannot match. If home theatre is more your thing then the M22s will do the job fine, same if you have a small and cozy room with no future possibility of moving.
However if music is more your thing (or even 50:50) or you feel yoru room is large enough or you plan on having a larger room sometime later, then think to the future and buy the M60s.

That's my three cents. (good call on the Bose)


"Those who preach the myths of audio are ignorant of truth."