I don't get the thirst issues anymore but I remember them. It used to leave me feeling so dry in the mouth like I was chewing on cotton wool lol.
Great work on the bench PR. I don't know if dosing with food or not will make any difference pre workout so stick with what you prefer.