I have exactly the same problem. I have replaced the pump and as the I originally thought it was the OH cut out I changed that thermostat as well. No difference however, I have been told on another forum that the thermocouple is the most likely culprit so I now have one on order. If it pans out I shall get back to you.
John, October 2009