Im thinking Jozu fought on the the Level 6 Prisoners. Pizarro or Vacsco Shot. Im under the impression that Franky Fights Burgess. Wrestler/Macho Man of BB pirates vs Macho Man of the SH's. His performance vs Sabo leads me to believe he's not Jozu level.
BB vs Luffy
Shiryu vs Zoro
Vasco Shot vs Sanji (Could Swap with Jimbei)
Avalo Pizarro vs Jimbei (Could Swap with Sanji)
Burgess vs Franky
Doc Q vs Chopper
Catrina Devon vs Nami
Laffite vs Brook
Van Augur vs Ussop
San Juan vs Robin and Carrot
As far as the when BB will surpass Prime WB, Honestly he probably just wont lol
Also Oda fucked up giving Shiryu the invisibilty fruit and not Jozu's Diamond fruit smh. Still Salty