Granted, im personally assuming Marco won't be involved due to thematic elements in the arc right now, as well as Yamato even fighting Jack.
The matchups are the case though, we at least can tell where Oda is going on.
Queen with having interesting after Sanji beeing Judge son.
Ulti and Pageone trying to defeat Nami and Usopp again after the first battle
Sasaki facing now Franky in a heat battle
WsW who have a connection to Jinbe from the past
Every of these battle as set up, only King and Jack are left, why should Oda switch Jinbe to Queen, a character without having any set up for Brook who hasn´t any set up to WsW? Why destroying the set up who he already put into Jinbe vs WsW. At this point it does not make much sense to switch up the fights in case for Brook, Jinbe has nothing do with any Calamity so far. His set up lies between his match with WsW and Oda still not resolved it.
Yamato facing Jack could happen too and then we have Drake who give Zoro his words of protecting Chopper. In that case Oda even could decide to give Drake a fight with Queen while Sanji getting King. These have potential to became great battles, since Drake also has his set up to Queen(first encounter). Jinbe most like stay now with WsW and having him as fight, I doubt Brook take it over him.
So far I can see Brook taking on Hotei while Chopper fighting down Fukurokuju? The two strongest guardians of Orochi?
I can´t really see Brook stealing Jinbe set up fight in case to get his own battle.