I would go back and think what overstimulates him and remove those triggers. I realised that on a day that I'm tired and not patient, my girl will moan more and even hit. If I'm patient, redirecting, talking etc, she won't go anywhere near these behaviours. We've had 3 meltdowns in the past 6 months as I try working on understanding the fact her 'bad' behaviours are just frustrations of not knowing how to express herself. More I slow down and don't expect her to understand my world, easier life we have.
One thing that I’ve noticed when my daughter at that age is tantruming is I remind her of the behavior I want to see. I let her know mom will be with you when you show me this ______. Then I remain close by but ignore the behavior. It stops her unnecessarily crying every time and she starts using her words to tell me what she needs.