AIBU to think that "I'm sorry I did/said that, it clearly upset you, I'll try not to do it again" is more likely to be accepted as an apology than "I'm sorry you took what we did the wrong way, it was only a joke"