YES there must be a punch or something!!! He forgave the tea poisoning FAR too easily in HOUND, this is not something that should be forgivable in the same way.

Although I can see a HARD punch (pulled at the last second, John wouldn't want to break Sherlock's jaw) and John yelling "You utter bastard!" or something and then accepting it fairly quickly and offering tea or something.