It is not a coincidence that we have the fight between „mom“ and „kid“.
Like Yamato, I'm expecting Law to eventually be removed from the fight. I sincerely think we are going to have an awesome set of fights between Kid/BM and Luffy/Kaido. Hell, I wouldn't even care if it became a 2v2 in some form (i don't expect it to but that would be sick, only because it warrants some of the blows Luffy owes Linlin).
But yeah where Luffy uses a new G4 or G5, I expect some cool new magnetism manipulation/form that allows Kid to fight her evenly. Kid seems to have the same exact tenacity Luffy does when it comes to fights. We'll see how it goes.