This thread is pretty old, but popped up in my email today, so here goes.
The whole water thing is such a pet peeve of mine. Drink the free cups of ice water, for heaven sakes!
There are great phone charging plugs located around the parks. A favorite spot is by tables inside Gaston’s Tavern...