It's fine if you hurt his feelings. He hurt your feelings. Friends are allowed to fight. I say punch him in the face if it'll make you feel better. It's healthy to fight it out sometimes.

...Should I give him a talking-to? I've never had to do that before, but I bet I could be intimidating enough.