D_Hailsham,
Can you please cast your eye over the following 2x images and tell me if I understand you correctly?
Existing layout
Power to junction box provides power to and from programmer, cylinder stat, room stat, pump and 3 port diverter valve.
New layout
Retain programmer...