At the current rate I have zero faith in Social Security being there when I retire.

To fix it we need a combination of increased social security tax, increased amount of payroll to tax, raising of the retirement age, decrease of benefits, ability to privatize some of your social security payments.