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"

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.