Annoyed at this - but what did I do wrong

[foggydew]

Maybe small, but I want things to change. I've been away for a few days, and feel refreshed and different. Friend is trying to be nice, trying to include me. His girlfriend said things feel good, they have lasted 3 months now. I hope it continues.
But I don't want to settle for the rubbish he deals to me sometimes, and I don't want to keep quiet about it. However, I do want to defuse things if I can, so that I don't feel like blurting out his behaviour towards me. Yesterday we went to a shop where he wanted something repaired. They couldn't do it, but explained rather confusingly where he could go to get it done. I also wanted to go somewhere for what I needed, and he was aware of this. He set off, obviously trying to follow the confusing directions, and asked me for help. I told him what I had understood, and he followed the directions. When we arrived, it wasn't clear which house he should go to. With a really nasty smirk, he said 'and you would simply have gone to one of those houses and asked - how stupid you are' and laughed very unpleasantly. Now, I don't care if he gets the blessed work done or not, I was just trying to be helpful.
1. What could I have done to defuse the situation? I felt/feel hurt. Nothing new.
2.Right now, I feel like telling anyone at all about it so he doesn't think I will always protect him. I even brought the subject up when his girlfriend was present. Maybe not necessarily a good idea, but why should I pretend he's perfect? Maybe a bit of triangulation, not sure. I do make sure that I don't make him out to be any kind of monster.
She is nice, he should be good to her ...

[PLEASE - NO RUN MESSAGES]

PLEASE - NO RUN MESSAGES This is a high level discussion board for solving ongoing, day-to-day relationship conflicts. Members may appear frustrated but they are here for constructive solutions to problems. This is not a place for relationship "stay" or "leave" discussions. Please read the specific guidelines for this group.