When And When Not To Apologize

   Okay so apparently I upset G last night. We were, or at least I was joking about something and then all of a sudden he goes off on me. This was over text by the way. And he wouldn't drop it when I told him that I was joking and I was sorry I upset him. Last night he told me that he was going to bed and didn't respond when I said I was sorry once again. I figured he wouldn't but it still hurt.
  I should probably give you guys what I know about G. He has had some pretty bad relationships like I have but his never escalated to what mine with Donkey did. They always messed him up. Cheating, treating him like dirt, you know the usual abusive with out physical harm type relationships. Because of this he is very sensitive and doesn't trust very easy and he believes that when he is happy he will always get hurt.  He also told me that in his past relationships that when ever he would get mad and say "goodbye" his exs would beg him not to say goodbye and still talk to them, but the first time he pulled that on me I said fine whatever goodnight. After a little while he apologized for trying to "manipulate" me and that he was wrong to do so and that my saying fine whatever gave him a figurative slap to knock that stuff off but he pulled it again last night but since I was hurt more that last time I apologized instead.
    I don't know if that was a good idea or not. Then this morning i sent him this

"I know I acted like an #$% last night and I'm sorry. I knew I should have stopped but I just didn't think it through and I'm sorry that I treated you like a douche bag. I understand if you don't want to have anything to do with me since i said I would do anything to not break your trust but I did it again last night and I'm sorry. I wasn't thinking and I thought that just because I was in such a good mood that I could say things I took as a joke that you would too. I'm bad about that and I need to learn not to do that.Again I am so sorry and I understand if you are upset with me and don't want to talk with me."

   I sent that around 9:30 this morning and as of 11:38 he hasn't responded yet. My mom said that I had nothing to apologize for but I just have this feeling that I do since i know it is so hard to gain his trust but I have basically lost it twice. I have been trying to get him to realize that just because he is happy he wont get hurt but I have been doing a terrible job of that so far. 

   What do you all think? Was it a good idea to apologize or am I just feeding his over reaction by doing so? Any advice would be greatly appreciated.