3.B.
I think the only thing you should add to what you're doing is to give him a time out. If he won't sit still on a seat, put him in his room w/ the door shut. Stand outside the door and when the 2 minutes is up, say I'd like for you to come out if you're ready to be nice to mommy. And if he's calm then let him out, and drop it. He knows what he's doing.