I ran the numbers recently and the numbers were even more grim, but I'd need to track down all my sources again.
I just think the main point is that income is not the number to focus on. Wealth is the end result of the equation, and income is only one part of that.