No, he didnt go to fight Khabib. He could've fought Khabib before he was champ, but Conor wanted none of that shit. He wasn't concerned with testing himself.
The reason he fought Khabib is the same reason he fought Mayweather. He's not looking to challenge himself as much as he's wanting to fight whoever has the belt.
He was going to fight RDA, but as soon as he lost, he all of a sudden wanted to fight Alvarez. Why? Again, it's because he will fight whoever has the belt.
So what does he want at this moment? Another title shot, right? He doesn't want to prove himself against Holloway or Ferguson? Oh wait, he'll only do that if they have the belt...