I agree with your last paragraph; we're putting all of our collective eggs in one basket, and we need to branch out.
However, if we eliminate "old and infirm" as a Very Large social category by making our species effectively immortal and perpetually healthy, then our efficiency as a species goes way, way up.
Older people feel better. Our species becomes stronger and more capable. We get to colonize other planets sooner. Everybody wins.
Ultimately, for humanity to survive this planet, we will need to expand. Even with all Malthusian predictions aside, humanity's existence is up against a ticking clock whose hands we can't even see.