I would trade in the M22s for the M5HPs and be very happy doing it. I am betting the M5HPs will sound better than my M80v2.

What makes you think the midrange driver needs improvement?

I personally don't want to pay for fancier terminals.

House of the Rising Sone
Out in the mid or far field
Dedicated mid-woofers are over-rated