Besides what has been said, and providing you have good dream recall, i add one more thing : Build up your intention/ willpower muscle. I donīt want to sound like you donīt have enough intention

There are many ways to build it. The most known is to choose a technique. But if they donīt get you into that mindset, just try a useless a exercise, as Laberge describes in EWOLD. I like to count my footsteps, which also helps with awareness.

Good luck !