The problem should not persist if you have the latest Nvidia driver installed. I cannot remember how many drivers later the thing was sorted by Nvidia, but it was eventually. I have the GeForce GTX660 card in my computer and there has been no problem with the water surface now for some considerable time.
Angus.