I don't think we need to steer anyone anywhere. Maybe I read it wrong but it seems to me it was the op asking about going from M22s to the M60s to the M80s.
I really don't care what anyone buys, I don't have a dog in this fight. Hell I don't care if they buy another brand.
I too see he is getting confused but I also see it is he that is asking the questions. No one is pushing anything on him.
If it were me and I had the Yamaha and was not sure about what to buy I would more than likely play it safe and go with an 8 ohm speaker.