Hi stem, thanks for your detailed response. Yes you're correct with your first diagram, the wiring into the thermostat/timer is where the boiler is spurred, it looks a bit dodgy tbh, have you seen that before? We have no other thermostat so we're all good there.
So basically remove link in...