Does the Octopus agile tariff save you any more money? The battery should mean that you never pay the peak time costs and you can top up the battery with cheap overnight power when there is less sun in the winter.