I think the war won't end until until we have some 1v1 between heroes and villains. Shiggy will be very weak so Giganto will take care of him while the others fight that will give the heroes a chance, after that we need Dabi's revelation and UA traitor, only then the war will end.
In the next chapter there will be a fight in the vestiges world leaving Deku and Shiggy unconscious, at the end of this or the next one Machia will arrive.