Idk if Neko/Inu are fighting Jack again tbh. I think they only said they're "showing" him their true form.
Otherwise, it all makes sense with Luffy beating Kaido, and the new monster trio beating the Calamities:
Luffy vs. Kaido (emperor vs. emperor)
Zoro vs. King (sword duel)
Sanji vs. Queen (tech fighters)
Jinbe vs. Jack (fishman vs. fishman)
Then you can have Franky, Robin, Brook beat the Numbers/Tobbi Roppo.