I hope so. It just seems too easy for an arc climax. At least in other arcs when they finished their fights they had something do (finding the bomb in Alabasta, saving robin and escaping from EL before it's too late, slowing down the birdcage in Dressrosa) but here they have nothing to do except wait and run around despite being rather healthy outside Robin ( Nami/Usopp/Chopper got roughed but seems to have recovered) since they have no involvement in the "Onigashima fall" plotline who is for Momo.