And it is not altogether self-evident that current storage solutions can be scaled up arbitrarily without hitting a point of escalating costs, as they are every bit as dependent on limited geological resources as oil extraction is.
Not in the slightest. Good enough bedrock is by no means rare. They are limited in the same way the global supply of gravel is finite.

Peak oil is not an energy crisis. It is a liquid fuel crisis.