OK, I said I would let you know how we got on, a bit of a mixed story but it IS all fixed, here's what happened:
Heateam man (Potterton Baxi Service team) arrived yesterday. He mentioned he had never worked on my type of boiler before and that he had only been with the firm for 3 months. Not a good start I felt.
He set about trying to diagnose the faults, I mentioned the Diverter valve and he seemed unsure. He spent about 5 hours messing about, going off to call colleagues, we went through the dripping tap test where he proclaimed we had a leaking tap (we don't), he sprunk leaks at every move, got more frustrated, swearing under his breath and basically made an arse of it. I told him I wanted to see the diverter valve and pump replaced, he didn't seem keen to do so. He went off on another call in his van (out of earshot) and came back....he was going to replace the valve afterall.
Anyway, to cut a very long story short, he was here for over 7 hours, in that time he did eventually repalce the diverter valve, fitted 2 pumps, broke both of them, replaced the water pressure switch and then left us with a boiler with no pump, so no heating or hot water. He managed to soak the PCB with a leak, then he dried it off with a hairdryer (my suggestion as he looked like he was about to have a breakdown himself) Then, he said the wires were warm, a sure sign the board was about to blow.
I had to point out they were warm because he'd just been drying them.....
I was NOT happy. He did at least manage to ensure that we had another engineer out to us
2 days later. I was still not happy but I was glad to see the back of him.
Today (following day) we get a call from another engineer, a female one, she was passing by, could she pop in to fix it. YES!
She was here on time, got on with it, fitted a new pump, fixed the leaks, switched it on, tested it, told us the diverter valve was almost definitely the issue, and in under 20 minutes, practically ALL the radiators were hot AND the thermostat on the boiler is now set to very very low, whereas before it was always on maximum. No fuss or drama.
So, you were all right, it was indeed the diverter valve, and once a professional person was here, it was sorted very quickly, a new pump can't hurt either.
The rads that never got warm are now hot, I got home to a lovely warm home, its absolutely lovely.
Thanks for all your help, the knowledge has been invaluable.