I'd also recommend witch hazel...it's an astringent and it's always worked really well for me in preventing razor burn and relieving itching.
But as for the main topic, I find it disconcerting that he'd try to do something that you clearly said was a hard limit, regardless of whether it's something you're normally okay with. o_0 At least it ended with cuddles...