...
If what bothered you was not getting the mask cleared, and having to look through a mask full of water, I can only suggest practice. For whatever reason, that particular thing still bothers me, 900 dives later -- I've just learned to stifle the discomfort and get the job done. You can learn it, too.
If you can figure out precisely WHAT the issue is, you can either solve it yourself, or pose a well-defined question to the board. You'll likely get a bunch of useful answers. Mask issues are very common, and most people can learn to overcome them.