[adrianN]

You need to solve both problems to reach 100% renewables, but doing in the order of demand side improvements, short term storage and then long term storage is probably the cheapest way to proceed.