[ensonar]

If there's one thing I've learned about dreaming, it's that it can be progressive if that is your intent.

My suggestion in any situation where you find something reoccurring like your dream-waking, is to consciously try and guide it in a direction. Make it active rather than passive.