heating side of it started to hit mian trip out, but hot water was fine. now the hot water is causing it to trip the main switch also. a black valve above the pump was leaking,so replaced it by qualified corgi man. he is at a loss as to problem and is sugesting a new boiler??????