Don't worry. Unless you are going into the cam belt area to change the belt, i wouldn't bother.
The fan coming on will be normal, is has been F'in hot today.
If you plan on changing the Cam belt, i personally would change the pump, rather than pay again some time later, it is virtually the same task.