There is no debate for the #1 spot. Mayweather is the undisputed #1 PFP fighter in the world. He was before the Oscar fight, and he did nothing to hurt his status.

If we want to have a debate regarding Pacquiao, the debate is whether he's #2 or whether he's #3 behind Winky.