For Sapling we increased the depth from 29 to 32 (by creating a new commitment tree). This is essentially what @ebfull suggested above, although not prompted by an attack.
Per the referenced spec PR above, the chosen depth is 32.
We're using predefined block heights. We'll see how well this works with Overwinter!