I think it will involve both Luffy's Grand Fleet and BB's fleets too, and some team fights here and there those matching with their jobs. Law, Kid might fight other characters that will participate in that war, depends how you see it, I see Oda just dumping BB, Gorosei/Imu, Revs, Supernovas...