Ditch, I'm really glad to hear you survived that whole ordeal! Good to hear the surgery went well and I hope the recovery isn't too bad.
This also raises an interesting point in so far as hydration. I have heard that over hydration can actually be a problem. I don't know the specifics but I -think- it amounts to not having enough electrolytes in your system if you pee too much and it is always clear.
When I served in the military I was -always- drinking water to stay hydrated for PT and 'humps'. At one point during the school of infantry I was drinking a gallon jug of water at night before I went to bed. Generally on average I would wake to urinate (Had to go BAAAAd) at least twice per night during any kind of training event or school (And yeah, it was always crystal clear). I never really noticed any adverse effects from my non-stop water drinking 'habit' but I was told that over-hydration is a bad thing.
If it were me I would continue to drink lots and lots of water. Electrolyte deficiencies sound a lot more bearable than kidney stones!