> Batteries are becoming cost-competitive as well.

Can you quantify that?

As far as I can tell the Powerwall is about as cost-competitive as battery storage gets and that's still far more expensive than just using grid power.