Thanks for the advice, so the consensus seems to be stick with a cylinder rather than a combi, but replace the thermal store with something newer. Anything I should be looking at superficially when getting a new cylinder?
Also is there any mileage in having a chemical flush rather than power...