Well you can give water consumption in gallons, cups, liters, quarts, etc
Other than that, i would say that Taurine and potassium will likely help as stated above.
As far as cycle goes, maybe try lowering A-sin or take e3d
Usually I would say drop the test to half your Tren protocol. However, you are on Sust so there will be quite the time lag.
I like Prop with Ace (short and short). Personally, I would actually switch if it were me, lower Test dose, lower A-sin (maybe even drop and have on hand).
The cramp could just be a tweak, but the long lasting cramp has me feeling as though you should get your CPK levels checked. Along with that they would check SGOT, SGPT, and LDH. If these are elevated- Potassium can be a bad idea.
It really could be so many things. Also, so many other things can be factoring into why you are cramping.