Batteries should see drastic declines as well. $300 is already considered a steep price even though it is the all-in price. We are talking about $50 at the cell level for LFP chemistry soon.
The other grid storage I wonder about was that Army salt water battery that Jeff Dahn said fairly effusive things about a few years ago. I have heard nothing of it since, so I assume it had cycle problems or other fundamental issues.