Having owned both (currently m22 + EP175 and in the past m60 - now at my parents house)

I wholeheartedly recommend the M60s for music, given the choice between the two setups.

For movies & videogames, I prefer the m22 + sub.

I do about 50-50 music & other, but even with that split I would still lean towards a pair of M60 instead of the bookshelves + sub.

Since you already have a sub, I suggest you take the plunge for the m60. The mids and highs are in my opinion similar, and the smooth extension on the m60 really helps.