Paul, I'd be surprised it your water pump is causing overheating problems, I would only normally change one if it were leaking or seized up. Have you got one of James RG's bleeding kits on? I fitted one on Backy last week, quite important if you do loose a drop of water. I have them in stock at £20 post paid if you need one.
Chris P