I'd say you're on the right track. Dreams do help us interpret our subconscious taking our inner landscape and presenting us with what stirs us the most. I learned dreaming of water is definitely a sign of our inner emotional state.