Social Security is easily the simplest problem in the country to solve. Just raise the income cap. It's around $170K now, just raise it to $250k, or $500k, or whatever some smart statistician (not MAGA, they can't do math) determines.

It's really as easy as that. Some higher income people are going to complain, but who cares?