Don't worry, the good guys are in charge now so I'm sure they wouldn't do anything dangerous with surveillance.
(Seriously, I cannot believe how many folks who would describe themselves as freedom minded do not seem to understand that even if they totally trust the people who are now in charge of such a powerful tool, eventually it will be in the hands of someone they do not trust. )
but also - yes, agree with your point: just stop subsidizing immigration and the problem will pretty much take care of itself