Had this very problem last year, it was a blocked filter due to an unclean system, the same symptons, pre-heat would run but H/W demand would push heat down the C/H flow.
Test by turning off the C/H flow isolation valve, run the H/W (not pre-heat), if the filter is blocked, the temperature will rise rapidly until it reaches about 85c then shut the flame off, it will then stay off until the temperature cools sufficiently and will run through the process again.
The filter is located in the bottom brass L/H section of the boiler, if you take out the C/H pressure switch (older models), you will see the filter in behind through the hole. It is extracted to the left after removing the flow connection to the brass block.
Carefree, October 2011