> It's insane to plan out infrastructure on the belief that private companies are capable of building such large buffers

You can make this a requirement by law.

Or create an economic incentive for it and let the market do the rest.

I tend to favor that approach instead because it allows more room for innovation and makes it much easier to quantify exactly how much you're spending by distorting the market in that way.