Hi Simon,
I have coded the changes to handle the delay and the firmware work-around for the valve not closing.
I will run it for the next 24-48 hours to make sure nothing has gone awry and then I will send you the link to this version.
You could have it now but I wouldn't like to be responsible for your heating failing.