My fiance recently graduated in psychology, and we have two kids. This article basically mirrors our current sentiment of how we want to raise our kids.
I have one thing to add: Don't beat yourself up if you fail to do it right. After things escalated, talk to the kid honestly, tell her what you felt, and ask her what she felt. And try to do it better the next time over.