I would try using cold water. I used to have the same problem if I had to wear a uniform later at night. For me it was easier to get a good smooth shave without irritation by doing a WTG and two...