I think I would first figure out exactly WHY it pissed him off.

If it was because you accused him of something that was untrue, that is one type of punishment. If it was because he didn't like the way you were thinking about YOURSELF during this, then that should be another type. If you see what I mean?

I think in the first case I'd do something I really disliked. But in the second case, I would do something more along the lines of what FR suggested.

Good luck with your relationship, and do try to remember that this is NOT a repeat of the last one.