I try to drink mine throughout the morning so I can get the peeing over with. I don't get crazy though, I just make sure I get 4 cups/day of plain water. Then I have other stuff, coffee, tea, etc.
If you are retaining water, it is temporary. The sodium in your system is dissolved in the fluids you take in. The more you drink the more you'll pee and the sooner it will get flushed through your system. Eventually you will flush it all out. It's good to be aware, so you understand why those extra 3 lbs. the next day, but I wouldn't worry about it or avoid salted things, unless you have health issues.
Life's a journey, not a destination.
It's easier to stay on plan than to get back on plan.