Still pointing to a restriction/blockage in the ch sytem and still likely to be the return filter. The ch or primary sensor operates for both ch and hw so unlikely to be that as combi boilers are more likely to overheat on hot water rather than ch and it works on hw.