For the shichibukai, you forgot Moria who has a story with Kaido.
As for the Supernovas, I think Urouge might be there. Bonney is still a mystery. And don't know if Capone and Gastino will be there.
I'm not sure if marines will be there, or at least let the pirates fight between each other and...
