When I have a student with this issue, I suggest a couple pool sessions of swimming with swim googles (not a mask) and a snorkel. This pretty much will fix the issue as you get used to mouth breathing with your nose exposed to water. Alternatively, you can use a partially flooded mask for your snorkel swimming.
Jackie
Jackie