Would you have liked some time dedicated to the Kidd/Apoo/Hawkins Alliance (had Kaido not shown up, naturally) to defeat her then?
As for the Supernovas, I have always felt that Kaido's defeat should have been a team effort by the Supernovas, and not just Luffy.