I agree that current Max is better than current Conor. Maybe better than any version of Conor, not sure. But, I disagree that Max definitely matches up better with Tony. He might, but I'm not sure.
I think to beat Tony you have to capitalize on an early mistake and put him away. He's been stung a couple times (Lando and Pettis) early but he recovered almost instantly both times and went on to quickly take over and finish both shortly thereafter. While Max would almost surely land on Tony, he doesn't have big one-shot power. Max would need to beat Tony in the kind of fight that Tony also thrives on. I don't think anyone, Max included, can win a fight with Tony using pace, attrition, and volume. Conor has more power than Max, so there's at least a chance he could do enough damage to really get Tony in trouble early. I tend to think he wouldn't be able to as his power only partially translates up to 155, but he at least has a chance.