While you focus on part of the issue related to aging boomers, you have ignored the more significant one to some extent... demographics. There are two things that determine whether a person has enough wealth and income to get from retirement to death... their retirement income/wealth and how long they live. When social security was first begun, people were expected to die by age 65.
Since that time, the life expectancy of those people who make it to age 65 has exploded, but the traditional savings programs have not been expanded to provide for that. While it is easy to blame "corporate greed", the reality is that only a third of people worked for large corporations and I see little evidence they are retiring better or worse than any other group.
Many of those big corporations went through bankruptcy as the full cost of their pension plans caused them to not be able to compete with imports or newer domestic competitors without the funding burden of legacy pension plans. So not sure bringing pension plans is an option as long as we allow imports.
Finally, while it is convenient to blame the rich, at least with respect to most of those big corporations, they are not owned by the rich, but rather owned by the public. Including the pension plans and university endowments that fund retiree benefits and college scholarships.
So, let's park the class warfare over to the side, since it really is not relevant to this conversation. Instead, we need to recognize how much our society has changed. Two of the most fundamental changes relate to the number of years people will not be working once they retire and the number of people who are working relative to the number of people in our society who are not. Those are big!
Citizens who want government to pay, are really saying they want young people and the unborn to pay for their retirement. Citizens who are saying they want companies to pay are really saying they want consumers (mostly young people to pay for their retirement). People who want to use an aging population to argue that we should redistribute income and wealth in our society differently are arguing we should be more "equity/outcomes" driven and less "merit/opportunity" driven. Sounds good until you realize societies that embrace that ideology end up collapsing leaving the poor devastated.
So, how do you get around this looming issue, that is not going away. You hit on part of the answer. If we are healthy and plan to live long, you will need to save more or work longer.
For many that might mean doing something totally different that supplements one's income (thus preserving one's savings) and is more rewarding or less taxing than their "jobs" were. That is a much better retirement than the previous generation where most people were dead at age 65.
Alternatively, we need to begin saving when we enter the workforce and build our lifestyles on 90% of our take home, not 110% as many people do. We need to plan for retirement, this will be even more important for young people today, given the ratio of older people to young people narrowing, you can't expect much help from younger people in the future.
We need government to be more frugal. Government is not free and no matter how government taxes, the cost of government gets worked into everything we buy. If government spends less, that leaves more left for people to save. I support a social safety net, but the fewer people there are supporting that social safety net and the more people depending on it, the more people fall through the cracks.
It may seem "cold", but we need to secure the border. We also need to expand legal immigration with the goal of increasing the number of people paying into the social safety net and not expanding the number of people depending on it.
I could go on, but it wrong to believe that government will ride to the rescue or corporations will rise to the rescue. Besides each person's personal savings and Social Security, the only real option is to return to the expanded family unit, where three or more generations share the "same roof".
That will be the reality for most Americans...