For the disability cap, it should simply be eliminated. What do I care if some millionaire kid gets SS and Medicare? They are likely paying for it in taxes (or should be).

I'd rather that than have someone lose healthcare because they saved $15k (1970 2k in today's money). Or worse, because Grandma left them an inheritance not knowing the impact that has on their heath coverage.

Severe disability does not go away after your bank account hits 2k.