Hello, I was also working on Water material. Im sure im using a different system. mostly using the water plane project from UE. ill take a look into your project. see if ican help 
btw the material i use have alot of problems currently. im stuck here.