The problem with the benevolent AI idea is that it's not in the interest of anyone with power/money/production to create it.

That's why I agree with your second point of rethinking "work". Instituting a Universal Basic Income lets us keep capitalism while putting more power in the hands of consumers and not relying on the kindness of AI/strangers.

Otherwise, we'll continue to see an increase in wealth disparity until there's no longer any function of the market.