Cath - I wear tri shorts, not cycling shorts. Too much padding in cycling shorts and they irritate my bits terribly. I think unless you are very skinny (which I'm not) tri shorts have enough padding.
Also - yes, drink lots on the bike even if you're not thirsty.