Thanks for the tip about cheap bottled water at LAX, schwarm, and for letting us know about your experience at the c/p.
I can't offer you much more than my condolences for the idiotic treatment you received, no matter how graciously it was served up. The complaint form is a good start, and, if you can muster the energy, a letter or two to your representatives can't hurt.