The only way to solve anything is to keep it simple. 10% flat tax, no deductions for anything, and everyone would have some skin in the game. Anything else is just begging for nothing new to happen.
I don’t think the 401K limitations are a done deal yet - certainly Trump keeps pushing back against them - unfortunately the federal tax system has been pretty much from the start one of compromises, tradeoffs, and inequalities - I would sure like a flat tax instituted, where everyone would have some skin in the game and the “rich” who now pay an inordinately high share of the taxes would finally get to pay a fair share, but I doubt it will ever happen and in the meantime we’ll always be dealing with balancing the interests of all sorts of constituents to try to get anything passed.....