Means test Congress first; Social Security really is an entitlement. You paid in. Congress owes you.
The panic about Social Security running out of money is all blue smoke and mirrors done with the goal of giving Congress more control of the American economy. We have seen how well Congress handles money. For every $2 we give in taxes, Congress spends $3.