Re: Kidney pain and drinking water
You need an ultrasound...especially given your history of a past kidney stone. Yes, the drinking tons of water can exacerbate the pain because, if there is an obstruction, the more water you drink, the more urine you will produce, and the more it will start backing up if there is an obstruction say in the renal pelvis or one of your ureters. Then, as you probably know, you get a condition known as hydronephrosis, which denotes the fact that you have an obstruction.
I'd go to the doctor.