I have M60s and I had M3s for awhile. I know what you're saying about the M3s - they're excellent, but the midrange doesn't come all the way up to the tweeter. Good for some material, bad for other stuff.
It sounds like you would be happier with M22s or M60s.
M22s with a KLH sub from Costco = <$500.