You think that you seriously need to work on your water and glass depictions? Girl, they're already great! (Then, if you polish them even more they would end being totally out of this world)
The abstract form of the glass (lovely rendered, by the way) gives you more freedom to work with the water movement. I love how you depicted the places where the water splashes and the dripping water on the glass structure.