Too Intense Stimulation

My S/O & I have been together for almost a year now & I can see the rest of my life with him. I hadn't seen him in almost a month & as soon as we saw each other tonight, we couldn't keep our hands off each other.
Flash forward to afterwards & yet again I am not able to get off because my clit is overstimulated to the point of fiery pain. We are not having sex (at least for now, a choice we both made early on in our relationship), but we make up for it. He's been able to get me off many, many times and is the first man to give me multiples, but almost everytime my clit is so painful I'm not sure if I will orgasm. 
I've tried to tell him to lay off the "mother load", but touching it & stimulating it is the only way we've found out that will make me orgasm & he's not down for oral at all. 
Any other tips we can try besides bringing a vibrator in the room? Thank you very much!
PS: Also, I think I am way to in my head while he's getting me off, so I am trying to work on it. :)