Yer waterpump should be done at the same time, as others have said it's cheaper as to get to the water pump requires pretty much the same work as I believe it's in a very tricky place so the man hours to do it are quite significant!
As for my brakes, I suffered brake failure a while after the cambelt change, what had happened is the brake line was not set back correctly and was rubbing on another pipe, eventually it tore the brake line and caused me to have no brakes coming up to a junction!
Audi were very good about it and offered me some kind of compensation for it, but it's shaken my trust. Before I would have always gone to the dealers as I believed they would do the best job. Everyone makes mistakes but it scared the hell out of me! So I probably will use a specialist in the future!