The real solution is making the average wage go up. Significantly. Which puts more money into the program overall.

With so much money having been shifted away from the average worker and Into the pockets of people who hit the FICA cap in their first paycheck of the year, over the last few decades, it was bound to have issues.