Currently fighting guys who he doesn't have to prepare for and also guys that he is basically told about 2 weeks before he fights them.

So when it gets to the stage that he needs to pick a fighter that's decent and he has to have a camp to prepare for, who do you think it'll be?

I'd say Seth Mitchell would be a good first step up for him.