The EFF is too splintered for this goal. They do fantastic work in courts, but they don't currently have the resources to lobby successfully.

They began to start grading politicians, but it has since been neglected: https://standagainstspying.org/

That said, they are currently our best option. You can support them by donating ( https://supporters.eff.org/donate ) and setting them as your Amazon Smile charity.