I think ultimately tech will result in humans being like the rest of animals - completely unable to participate in the economy. This will only start to happen once AGI is reached though which might only be a decade away or less.
I think you're right, we're going to need to completely rethink our economy to decouple the idea of human effort (Unfortunately I can't see how that's going to happen without everything first falling apart).
A single barrel of oil is estimated to replace about 5-10 years of a human's effort in pure energy terms. Our human ability in physical terms was already significantly obsoleted by that.
AI feels like the discovery of cheap oil but for mental effort.
At the same time, oil is getting more and more expensive and energy intensive to drill (and costly to the environment to use).
I suspect there will be essentially three different economies - Digital Human-experiences, and hybrid.
AGI will focus primarily on problems that can be mostly solved within digital worlds where it can cycle incredibly fast. Building software, finance, paperwork, etc, etc It will eventually evolve to design, control, and operate physical systems, but will need humans to intervene and fix systems (hybrid).
The human economy will built on experiences that are explicitly, and intentionally void of computers. Restaurants, guided tours, exploration, etc, etc.
Yes I could see that happening, assuming the AIs don’t manage to outwit humans and subvert power and take over.
However, even if humans remain dominant (political power-wise), eventually there will probably be fake humans/cyborgs, like Cylons in Battle Star Galactica, that can do everything humans can but better. And also provide human-level experiences. Impossible to know how long this will take though.