I'm not hating your take, it's kind of why I wanted this fight. Both of their wins streaks played a role, but my whole thing is - you don't need a puncher's but a submission chance against Khabib. Doostin was the only guy to put Khabib into any kind of danger dude had to work to get out of, and at the time it seemed like Tony's zhoo zhits would've been a far greater threat. Meanwhile, Khabib is so pillow fisted and Tony so durable - I felt like, if Tony was gonna lose, it would've been by decision. But that's a lot of time for him to try and sneak something in.
But now, after having seen how easy it was to control Tony on the ground... I'm not sure any version of Tony would really do well. Khabib kept getting better, too. Any post-Khabonor version of Khabib would steamroll Tony for sure.