It's an ancient Saunier Duval but you could still be spot on with the diverter valve, I'll keep you posted!
Nice idea about the suppliers, I take it they advertise in the B2B trade press or something, or might I find one on yell.com?
I notice there are a few IPHE registered CORGI plumbers...