get them back out to fix it properly and not just replace components to be honest they don't seem to know what they are doing,just replace things and hope its ok it could be a fault in the pressure switch,thats the thing that turns the water off when it reaches the right level,and turns the heater on
mm, July 2013