Think through the problem.
1. FISA Court precedent has already created a rather broad exception to the Fourth Amendment. Even without 215 most domestic surveillance could be brought under other statutory authority. The end-run around the Fourth is the hard part, not the statutory grant of permission.
2. The NSA Director would never allow any bill limiting his agency's powers to be considered in any way without protesting.
3. If you repeal that portion of the Patriot Act, which again you won't because you haven't done the necessary groundwork, most of the gathering done under 215 could be done under 702 given the "two to three hops" justification.
4. The NSA and the FISA court don't consider mere interception of communication to meet the definition of "collection," meaning gathering all of the nation's communications neither requires statutory approval nor invokes Constitutional scrutiny.
You're treating your adversary as if it's passive, and can't adapt other legal tools to serve this purpose. Loss of this one provision is meaningless in the scope of the agency's powers.
Finally, you're ignoring the most crucial part of the counterargument. Public opprobrium is a scarce resource that must be marshaled and treated as such. Every action that you take must be calculated to make maximum use of that resource, or you're simply squandering it.
I have no dog in this fight. I see the advantages and disadvantages of both positions. Seeing either side employ sub-optimal tactics is what bothers me.
If you're going to take on the best funded, most powerful, and most covert organization in the history of the planet, you better come with more firepower than this.