I think in this context a handshake is pretty good. A hug or a kiss when you're both really mad after a rough fight makes no sense IMO. I may be wrong but I think people have too much pride to initiate such affection after a heated fight. A handshake is doable.
Remember kids, the three words everyone wants to hear are: You Were Right
Weither you hug, kiss, shake hands, or do something else, it's all good when it settles the dispute, every one of them can be someone's way of making amends so there's no reason to think one is correct over the other.