Remember One piece is plot driven manga, mission, adventure eccentric. Never was a battle/fight eccentric manga.
You won't expect like good man to man fight, there's always mission "while fighting" or a side quests "while fighting"
Marineford war was the same
The final war would be the same with even more side quest, side battle, while fighting......