Yes. Please put some time into thinking about creative challenges to the surveillance state side of things. They want to limit agencies powers then surveillance powers should be the first we go after.
That's not going to happen, unfortunately, because a lot of the surveillance powers are explicitly authorized or otherwise not ambiguous, and did not rely on Chevron deference.