Thanks Ed,

I ended up getting a gas boiler firm out under a caveat of my home
insurance who took a look. After much tutting he decided a whole
diverter valve replacement was required. He's due to come tomorrow,
lets hope this sorts out my boiler.