Hi,
my boiler is doing the same as yours, i doubt it will be the diverter valve as it makes no difference if the electric control plug is connected to it.
I have had a chat with Baxi and ruled out frost protection as all the sensors are reading the correct resistance. They are telling me...