I think people need to drop the clash narrative of this arc. Oda teased this seige several times, and even Saturn is instructing the Marines to get York, Punk Records and the Mother Flame lab, indicating that shit WILL go wrong on Egghead when people start fighting.
We almost certainly still have 30-40 chapters of pure conflict.