Personally I never:
Forget to go to the toilet immediately before flight (last nervous pee);
Drink anything other than water before flying;
Drink more than I absolutely need before flight (not much);
Drink within an hour of flying.
Good luck with whichever remedy proves successful !
