Ray Peat is correct, drinking water when you are not thirsty can cause a lot of problems for you. But at the same time it is you that has had this problem for 2 years, and it seems to be getting worse. When you are thirsty drink water with some good quality salt on your tongue. Over time you will notice a big improvement in your symptoms.