Conor took a fight outside his weight class and lost. I don't think the UFC will make that gamble twice in a row, and Edgar will be ready by then.
If by Diaz you mean Nick, then it's not a bad idea. If you mean Nate, I think he's better off redeeming that chip at LW.