Hopefully the PLAN is all located in 1 cupboard,cylinder,programmer,valves,pump,cyl stat etc,otherwise might confuse slightly,but with the diagram should be ok.I always put the wiring centre in the location where the motorised valves are, as they are 5 core cables its a pain to extend them,S plans are a lot simpler than you may think.The basics are:
All connections made into suitable wiring centre(a honeywell pcb type is easy to wire)
PERM L to Boiler,programmer,roomstat reciever(if wireless),both valves(greys)
Neutral to boiler,programmer,roomstat or roomstat reciever(if wireless),both valves(blues)
Earths all connected
5 core wiring centre to programmer l,n,e 4th core hw on,5th core htg on
hw on from programmer-common on cyl stat
htg on from programmer-common on roomstat/wireless roomstat reciever
call for heat from cyl stat-brown hw valve
call for heat from roomstat-brown htg valve, all this leaves is the oranges which both go with the switched live for boiler.
I thought perhaps this might be of use aswell as using your diagram.