While expressing your desires, you would need to exercise control in order to prevent them from doing harm to you or to others.
Yoga exercises are excellent; the speaker does them every day, for an hour or more; but that is merely physical exercise, to keep the body healthy, and so on.
Whatever discipline you exercise should be based on the goal your child is eventually to reach, namely, freedom and happiness. I would show him towards what he is growing, his ultimate fulfilment, and help him to adapt himself to that. In everything that you do, you should keep the goal in view, and hence your discipline must aim at helping the child to realize that at a certain stage he will be above all discipline.