Ah, ok, not quite such a simple question after all.
Thanks for the replies - I was hoping it would be a lot easier to remove the combi boiler, but maybe a decent service would be the cheapest solution, especially if I'm looking at £600 just for the tank. It just seems such an overkill to...