Pool Builder here.
Man what a nightmare. I hope you figured out a solution but thought I would chime in just Incase. The simplest solution on this would be to raise the bond beam all around and shoot in an extra 2 ft on top of everything in the shallow end and spa. Whether this works with the...