By taxing everyone the same percentage of their income for Social Security that most Americans pay (e.g. killing the exemption on income over $100k or so), you could fund Social Security and Medicare indefinitely.
Eliminating the payroll cap would at least push back the day of reckoning a few years. But taking on huge new entitlements now makes no sense at all.