As you say try the M22s, they are a very surprising speaker for the money, I love mine, if you find they don't quite do it for you then you get that free return for the upgrade so no money lost. Have you thought about going with the M80s? They are right in between the M60s warmth and the precision of the M22s, best of both worlds, IMO, although the M82(M60/M22 combo) had a very special sound to it that I really liked but due to kids in the area I opted for the one piece M80.

Jason
M80 v2
VP160 v3
QS8 v2
PB13 Ultra
Denon 3808
Samsung 85" Q70