I think that Khabib has advantage versus Conor in wrestling and cardio. Conor needs to improve specially his cardio if he wants to beat Khabib. Of course he needs to have different strategy for Khabib than last time. Just marching flat footed in front is not the key to victory. Against Khabib he needs to try to avoid his take downs for first 2,3 minutes from rounds and than in second half of rounds to attack him. When Khabib doesn't have enough time to wrsetle and take crouches than he's less dangerous. But to avoid Khabibs take downs and his pressure you need to have great cardio and footwork.
With Tony, Khabib doesn't have these advantages and it will be wrestling against jiu jitsu. Interesting match up where Tony could finish Khabib. Khabib is favourite but Tony could be his cryptonite.
On the other side, Conor has big advantage in stand up skills versus Tony and that match up favours Conor more. He could KO Tony because this guy take a lot of shots.
But we will see in near future what will happens. Interesting time to watch this division!