There is an easy solution to make Social Security solvent. Uncap the contribution. Problem solved.
Also an underdiscussed issue with such a policy is that while it increases social security fund revenue, it decreases the amount of federal revenue collected. The CBO estimates that about 15% of revenues gained by an uncapped SSA tax are offset (lost) by a reduction in federal revenues. Worsening the deficit problem.
It’s actually pretty easy- pick three or four options that have the very wealthy kick back into society what they have been syphoning out and it balances.