Other options with 401ks

I like the idea of keeping the discretionary limit but decreasing the employer limit. Limit the total to 2x the discretionary limit and stop the catch up bonuses. I’m also good with A. C I’m not a fan of at all the reason social security is widely loved is that you get an actual return on your tax. Uncapping it would take that away not just to the 1% but to all the working professionals that already get taxed at the highest rates. I’m also fine with an upper limit of capital gains/qualified dividends before they revert back to standard income.