I don't think Conor gets to fight Khabib next. I don't think that many people would be interested in a rematch. Khabib absolutely dominated McGregor - even standing up, it was Khabib who landed the best strike. Why would anyone want to watch a repeat of that.
Then again, I predicted that Conor vs Mayweather would be a joke, which it was, yet people clamored to see that nonsense.
I'd like to see McGregor v Ferguson. If he can beat Ferguson, then he gets Khabib. I also think this makes more sense from Dana White's perspective - he knows that if he puts Conor in with Khabib again, he will just get mauled again and show everyone once again that he is, to quote Khabib, "a tap machine". That would be terrible for McGregor's star and for the UFC. Better to pit him against Ferguson, where he stands a chance.