So an update as promised, engineer was in today and replaced the flow and fan thermostat, and the flow thermistor.
Thought it had sorted it, however the boiler again tripped out on over-heat, He also checked wiring.
He's returning with a combustion chamber door seal kit, but I'm not sure why...