Hand painted masks break every time I update the mesh.

In production we consntantly have to revise our characters and meshes based on feedback from art directors, management and legal.

Every time we have to make a mesh change it breaks all our hand painted masks.  Even if we dont change the position of the mesh and just add an extra small piece of geometry like a pouch or button to the mesh.  It often breaks masks in texture sets on parts of the mesh that were in no way changed at all.  Sometimes importing in exactly the same mesh breaks the masks.
We often have to recreate all the masks again when we update our mesh, wasting a massive amount of time, or we need to export out all our textures and make a new painter file with flattened textures, breaking the whole "non destructive workflow".

Being able to iterate on both the mesh and the textures is an important part of a production pipeline.
How can we do this in Substance Painter?