Clearly, my egg math needed correction and I thank you. :)
In my, admittedly worthless, opinion, I think we've been putting bandaids on the outdated social security formula long enough. Its time for a new formula for calculating social security contributions - and benefit amounts.