Towards the combi boiler, I know this would be the long way to the radiators but the thought was if the combi was heating the water for the rads as well then it would not use as much gas to heat the water. I am making the assumption that combi boilers monitor the temperature of the water return and adjust the amount of heat required to get the water to the correct temp.