Thanks for the reply Stevie, but I've already been there on the condensate trap - I've now disconnected that completely on the advice of one of the service engineers.
Last night, I found another overheat temperature sensor on the air/gas inlet to the boiler. It's the same type as the one on...