I think you have very clear direction that makes perfect sense. Whatever you do, don't let any concerns deter you from your beloved hikes. I concur with this summary:
1) Don't dehydrate - it could even cause you to faint
2) Bring plenty of water - you can drink more of it later in the hike
3) Go Girl sounds great
4) Pee behind a bush if you have to - you won't be the only one and any passersby are people you will never see again and they won't care anyway (we've all been there)
Finally, any friends you hike with should be happy if you have to pee more than once - it means you are keeping well hydrated, obviously a good thing.