This may sound obvious, but be sure Water Shield is up and running as well. Any mana issues I encounter (which is very, very seldom) are usually because I forget to keep this active. Same with mana totem.