I have trouble with my skates after pants too. Some rinks worse than others (a lower bench in the dressing room makes it way easier).
I was definitely doing the two bottle thing for quite a while. Like you said, one water (more ends up on me than in me), gatorade (that I actually drink), and yeah definitely something for on the way home.