What's also needed here is some direct heat applied to the Republican Party, which deliberately politicized this area of policy after 9/11 to force the Patriot Act through and has steadfastly protected it since, labeling all opposition to it as un-American, unpatriotic, and similar bullshit.

Until it is made politically dangerous to do things like this, you can bet that those folks will continue on the same path.