Restructure Social Security as an income insurance plan where any claim is a benefit as supplementary income insurance with a sliding scale for higher income earners.
Why is this important?
Scaling social security benefits to degree of need as relates to gross income (ie - you only have a claim for social security income as an inverse function of annual income).