Customer charges to increase by an average of £31 a year before inflation between now and 2030