> But this ignores how productivity has been and will continue to rise thanks to machines.

While true for most of recorded, human history; that kind of assumption combined with hard limits like physics make your second point a more likely outcome. Unless you're suggesting humanity will re-engineer itself into a more sustainable form.

EDIT: forced typo