Fix Social Security the right way: remove the income cap.
Eliminating the income limit will not be noticed by 97% of the population who make less than $110,000 per year. For the rest, it is not a burdensome matter. This will cure any Social Security shortfalls for decades, if not forever.
Most people don't realize this because they never reach the limit, but if your individual income (whether married or not) exceeds approximately $110,000 you pay NO MORE FOR THE REST OF THE YEAR. When I started working, most working people reached the income limit before the end of the year and got a little "Christmas bonus" in their last few paychecks. Now you have to be in the top 3% of income.