Best thing you can do to fix the thirst and night time peeing is to drinks LOTS of plain old water.
Aim for 3 litres a day for 2 weeks if possible.
After that, 2l a day s fine, but, basically, as much as you can comfortably drink in a day. You'll find you pee more in the day (not necessarily...