The fight over 702 distraction anyway
They will have shuffled off operations to another subsection of the byzantine legal code that covers all of this. If they can save 702 as cover, they will, but remember that 702 was the silent escape hatch when their previous toy got taken away. Any attempt to reform it will fail until their is transparency and consequence for mass surveillance.
The FISA court is toothless, and rubber stamps almost all applications. The rubber stamped the approvals for all the big dragnet cases that came to light. Nobody has been fired or jailed for the millions of Americans that have been under nearly continuous and pervasive illegal surveillance since 9/11. The government as a whole knows all this, and it doesn't care because it wants to violate your rights and get away with it. They make sure that almost nobody that does care has any legal authority to act, and zero transparency is the rule of the day.
Stop trying to fight this on a section by section basis. Pass a law over the top to enforce sound constitutional protections across ALL of their programs. Block them from unsupervised access to data from before the law went into effect unless they can show, and treat access to that data the same as a surveillance request, with the same burden of approval to keep them from just paying somone else to collect the data they can't legally snoop themselves.
Then force external oversight and transparency on the programs, at least as far as forcing them to let independent auditors review the programs and data collected and post their summary findings and alert the DOJ and regulators about potential violations.
Gutting 702 and anything that looks like it is reasonable on the surface, but it's a game of whack-a-mole, when they can create three new hidden programs for each you take down.