Thanks for the tips about the filter on the primary heat exchanger and the diverter value, I'll have a look at those.
Tony I'm in E14, London - if that's close enough, let me know. I would be happy to pay you double up to a ceiling (say, £200?) - but I'd want to pay that extra amount only...