Thanks for all the suggestions.

I have changed my timeout strategy a little bit - from time-based, which he whined the whole time, to counting-based, which he gets done with timeout when he is done counting. It helps tremendously.

Originally Posted by AvoCado
Maybe check if your expectations around standards of behaviour are not a little too high?

Can you tell I am a perfectionist myself?