Actually, I also agree in total. In fact, not only would I do that, but I would also make the SS tax go all the way up the scale, up to and including Bill Gates, and also have dividend income taxed. SS payout problems fixed for the foreseeable future.
It is time that the politicians get less peferential treatment, and more treatment like we on the factory floor.