...except that Marx was concerned with "mere" capital while we're talking about automation, robotics, etc.. It turned out that capitalism on its own did not create the social unrest Marx predicted (at least in societies which didn't already suck for other reasons), but it may be that automating the workers out of being able to earn even a subsistence might in fact do so.
Another way of looking at it is that while Marx identified a real problem, his solution was essentially a bunch of wishful thinking which, when pitted against free market economics did rather poorly. But, free market economics is all about managing scarcity; automation points the way to a post-scarcity society (at least post-material-scarcity). Free market economics doesn't have anything to say about how to handle this -- so we're all in the dark.
It seems to me that as the marginal value of material goods diminishes relative to say the marginal value of not being beaten and robbed we should see a natural progression towards some kind of redistribution of wealth -- driven as much by enlightened self-interest as anything. ("We'll pay you welfare as long as you keep taking your contraceptive pills...")
Seems to me we're already seeing the natural progression you described in your last paragraph - basic income initiatives. This really looks to me like the anti-segregation movement from the 60s - a radical idea at the time, then 50 years later people don't understand how it was possible to have a society without it.
So a not-unreasonable guess as to "what's next" might be socialism, regardless of whether we're post-scarcity or not, and regardless of the success of basic income initiatives. Maybe ACA will be considered the first sign 50 years from now...