I don't think A2 will have more waves. But with damage and health increases, we'll most likely need strategic vuln buffs and both gobwalkers snaring and stunning them.
In A3, I think in tornado phase the pool in the center will be larger and deadlier, making it more difficult to pick up the tether.