Here is one way to do it. Just make a cube, the top would be your wave water shader. The side facing the camera would be water shader minus bump and reflection with a solid color, the other sides some shade of dark blue and no reflection. Then use a wave modifier to give it a little curve to the top and smooth your cube to give it the meniscus to simulate the water curve against the glass.
Check it out and see if it helps.
