Ed
I replaced the complete diverter valve, but I guess it could still have
something blocking it.
Yes I think I must draindown and remove the diverter and probably the
heat exchanger to inspect and descale, at least I seem to have
identified the problem to two options.

Thanks all
Dave