First off, thank you for posting this. It takes courage to tell stories of dives that go sideways here.
I'm with awap, though . . . I think the basic issue here is that you had a mask flood that wasn't handled properly, and resulted in choking and near panic and a poorly controlled ascent. This is what's called the "incident pit". A flooded mask, handled neatly, is not a big issue at all. A flooded mask that results in choking is a much bigger issue, but if you know you can cough the water out and you remain calm, it's still not a big deal. A flooded mask and choking that results in a feeling of needing to head urgently to the surface is a MUCH bigger issue, and a relatively novice diver can almost be predicted to lose control of such an ascent. All you needed was to hold your breath a bit as you went up, and your dive buddy would have written the story . . .
I'd say you should spend some time in shallow water, working on mask skills, until you can take your mask off and put it on again without turning a hair. Then, if you put on a hood or do something else that makes your mask leak, it will be a non-event.
BTW, a buddy who let a novice diver in distress ascend from 30 feet alone is not a buddy in my book. As I said in the first paragraph, all it would have taken was a brief breath-hold to turn this incident into an accident, and in that case, having someone with you on the surface might have made the difference in survival.