Given the new facts on the ground about the relative strengths of capital and labor, a rethinking of the government-imposed incentive structure is in order. In general, we tax labor at a much higher rate than returns on investments.
My preferred solution would be to stop taxing good things (income and investment) and start taxing not-so-good things (luxuries, frivolities, dangerous but legal products, etc.).