I think the next bottleneck is embodiment. AI can lay the best laid plans, but who will execute it? I think a possible solution to the dual problems of AI embodiment and unemployment is humans becoming avatars for AI. Imagine one of the unskilled masses donning a headset and being guided through all manner of work? Roofing, ACHVAC, stocking shelves, etc… No need to train anybody.
If I'm in my remote cabin I'm still faster than calling a tech, but in my city I can hire someone to do this who is faster. (though perhaps not cheaper)