Luffy fighting Akainu is a given, Kizaru starting shit with every N°2 in the manga and him kicking Zoro makes it very likely that Zoro will fight him but that's it, the real enemies are the BBP, there's no war with the marines, Oda is not drawing 40 more fights.
Luffy and Zoro have 2/3 big fights left, the rest of the Strawhats have their BBP match up and nothing else.