There will be a full-scale revolution if people are told that the money they and their employers have contributed to Social Security is going to be “means tested” and if they have too much money they won’t get it.
The absolute best solution is to allow people to opt out of Social Security with the provision that the same percentage of money is contributed by them and their employer into a retirement account that they can’t touch until a certain age.
Bush took a very tiny step in that direction after a big 2nd term win and with a GOP Congress. They let him twist in the wind. I can't see any Congress allowing this to happen.