There's a lesson you're all missing... Violence is the fastest diplomatic solution that determines a surviving body, quite the opposite of what our fairly misunderstood community would want. The fact you were being a physical smart-ass through the under-valued slap-stick, is just as bad for you as it was hilarious for you. Chances are you just need to ignore this fact and not intentionally attempt to f#ck with him.
As bad as it sounds, "Feigning ignorance is a blessing for the partial party."