I'm wondering whether the run on is caused by a faulty non return valve but it's very hard to diagnose noises by text. Davey service dept are worth a try…