I don't know, since The Massacre of Rafael, IMHO he has been like Jon Jones was to LHW after he smashed Vera, where he unequivocally has shown himself as being head and shoulders better than the field; only problem being, Jon did not constantly get hurt or celebrate Ramadan. Just like the Tony fight, the odds for Jon and Shogun were close, but I fully expect an absolute blowout. One guy has close fights with top fighters, even if he wins nail biters, and the other just annihilates them as if they were amateurs.
Had UFC chosen to give Khabib the shot already, vs Pettis, RDA or Eddie, I think we all believe he would have long been champ -- the belt, and who the UFC choses to give the belt to, is not the end all be all anymore