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...