One more vote to make the trade and then deal with the amp if it has issues. I have M22s and M80s and you will love the M80s, they have a much fuller, richer sound than the M22s and are worth the extra money spent, IMO.

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