Social security was never intended to be a government-enforced private retirement program. Mind you, it was sold that way to a gullible public, in part because the concept of being on welfare, even for old folks, had many more negative connotations then than it does now, but that is not what it does.
It should be returned to its original function as a security net for the aged and infirm, and no longer treated as a general purpose welfare fund for liberals to throw money at their favored constituencies. And like most insurance programs, you don't get a stated return on your "investment" - your premiums - you get payments only to the extent to fit the requirements for coverage - you meet the "need" requirements. Hence, it should also be means tested; somebody who already has adequate retirement resources does not have an unmet, insurable "need" and should not be drawing social security benefits.