I would also go with the diverter valve on the appliance as a possible source of the problem them boilers are prone to blocking up on the microbore tubing.
If the valve don't make the micro switches then i would go diverter valve / tubing but also check for other components (I would advise...