That sounds like a good technique, keep it up.

Regarding the scary dreams, I find it helps to repeat to oneself that when such a situation occurs you will not be afraid and run away. You will be calm and relaxed because the situation is totally under your control. It may sound simple and self explainatory which is why we never even bother to try repeating this to ourselves. I know it works and can absolutely be achieved if you put your determination into it.