There are other possible components to a solution. Many people cannot afford to retire at 65 or 67. What about a deal where, for every two months you keep working full time past your retirement age, the Govt will give one month of your combined SS/Medicare benefit to your heirs, tax-free, at your death. You pay in longer, the Govt pays out less.
This seems more equitable to me than a means test against the wealthy, who after all paid in just like everyone else. Hell, you can leave it to the Hetritage Society or Hillsdale College or some such place to fund their continued bashing of SS/medicare!