Finally getting round to this now and I'm going with a Nest.
Before I do this, does the following sound about right?:
In my original pic above red (C) and black (switched live) trace back to a junction box at the boiler. Fused switch below it with ring in/out and power to boiler on the...