I had same issue and the UseFixedWaterDepth ‘trick’ fixed it for me but what I’ve noticed when trying stuff out is that my old map had no separate landscape layer for water deformations. On the new map when adding water bodies there is automatically added Water layer where they reside on, I guess it makes it easier for water bodies to not get messed up that way.