Yeah I think prepping him about the behaviour that is expected is a good idea. Also the repercussion of inappropriate behaviour is a good idea too. Then he will know what is expected of him. Mine is also such a gorgeous child till she is tired or digging her heals in! You sound like a great mum, it's hard to think in stressful situations.