Well, I have just found out that a replacement boiler has been authorized free of charge and will be Ideal Isar HE 35. Unfortunately by the look of the reviews on some sites that I have just had a quick scan through, I could be getting to know the engineer very well over the coming years...