Well, people seem to forget adding two characters to equation, which changes matchups significantly. They are Daifuku and Smoothie.
Depending on whether Carrot/Wanda were able to take down Perospero during Sulong, I would add Perospero into equation too.
I can see Daifuku vs Brook and Yamato vs Smoothie matchups too. Jinbei/Brook swap may not happen. However, Jinbei/Drake swap is in realms of possibility too.
Edit: Forgot to add Chopper into equation too. So, it seems like either Brook or Chopper will fight Daifuku, who are you betting on?