The valves are right after the pumps, forgive the mess in the pics, I've got to take down the wooden frame and remove the old pipes still!
I put the valves in, incase I wasn't happy with how the pumps work on auto, however the boiler seems too smart for its own good with the ESBE valve...