I have a Baxi boiler which keeps overheating. After resetting, it would be ok for a few days and then would trip out again. I have just changed the internal thermostat and since then it overheats more quickly and has now started to make lots of clanking noises and throwing water out of the...