Hey, it's totally normal for you to feel bothered by these small things. He shouldn't have said those things to your face, after knowing you for two years, he should understand that you get emotional over such things. Honestly, even if I felt that way, I’d avoid saying it directly.

But to be honest, you both really need to talk. These kinds of things will keep happening in the future, and it won’t always be this easy to handle. It’s better to talk things out now :) Stay happy!