Re: this sounds oddly familiar
In fact, the whole affair is shaping up as the irresistable force of money meeting the immovable object of the security hawks.
As it generally does. US history is one long tussle between the public and private sectors for access to resources. As Heilbroner pointed out in 21st Century Capitalism (and it's hardly a novel observation), one advantage liberal capitalism has over centrally-planned economies is this tension between Business and State, which helps obstruct the worst excesses of both.
Of course the surveillance state is good business too, for many, just as other aspects of the Eternal War on Everything are. But as you suggest, it reaches a point of diminishing returns, and then more and more of the moneyed interests start pushing back. Add to that the normal pendulum of public opinion ("We don't know anything, but we don't like whatever's happening right now!") and we'll likely see another period of "reform" where government overreach is trimmed back a bit for a little while, and everyone nods sagely and observes that we've learned our lesson this time.