Interesting. If your not already try sleeping in absolute darkness to see if your dreams are more vivid. (In this case, it may be a bit much considering the context of the dream)

I had great success with dream memory once I started doing this - but considering how consistent you diary it may be redundant - I just wanted to share this in case you didn't know.