Unlocking Thermal Flexibility for the Electricity System by Combining Heat Pumps and Thermal Storage