New conventional boiler may be the way to go, the system will need to be upgraded to a Y or S plan, (I dont think new boilers allow for gravity HW systems anyway). If the cylinder is one of the older types without factory applied insulation, it would be prudent to change that at the same time.