I have a four year old who is very simlar to yours ! What I have been doing recently and it seems to be working is giving him lots of little extra treats that he likes ie sweets or time in the garden, then if he starts being naughty I tell him he wont go out in the garden for one sleep (one day lol) or he wont have the sweets for one day ! He soon got the message and yes we still have shouting or crying but we say to him if you are going to cry like that then take it in the front room we dont want to hear it. Oh and close the door !

Fingers crossed but its working.