I think we could combine all of those into an efficiency tax, any productivity that outpaces the baseline of what an average (otherwise untrained) highschool graduate can produce is taxed in proportion to the relative increase in productivity.
There's no slackening of the incentive to innovate, just the removal of a tendency of innovation to ine itably lead to centralization of capital .