Good point about the hills. Shows what an unusual race the P2P is!
Re water, I'm the opposite. I normally get through about 750 ml/hr on an easy training run, based on thirst alone. Less than that during a race (unless I'm... overdressed) but I wouldn't be without it.