If it has defo been working properly, draw out the Y plan os S plan and see whats the ways it can supply a S/L to the boiler.
Perm live to HW on from the timer on a Y plan is an interesting one - does this but with the cyl stat not the room stat.
Also lots of Y plans wired up wrong for...