make it that Senators and Congressmen have to pay into Social Security too. They can no longer use only a private plan.

Congress and The Senate should no longer be able to opt out of Social Security. If it is good enough for the American People then it is good enough for congress.