Let FISA die on the vine. There must be plenty in the laws already that should be able to deal with terrorism. If current laws are insufficient then the laws need fine-tuning.
Our anti-terrorism laws are INADEQUATE to say the least and crippled to say the most.
The FBI can handle domestic-based/related terrorism cases if they are given a clearer mandate and guidelines to do so. However, if the FBI cannot be cleaned out of anti-Trumpers and Obama saboteurs, then we will need a new, clean agency to deal with terrorism, both domestic and foreign (you cannot separate out the Islamist in the US, who, though not attached to a specific organization, is a self-adherent sympathizer and actor in their name).
If you are a terrorist with any kind of affinity to a foreign organization or ideology, then you should be surveilled by some US intelligence agency, and taken out if/when necessary by any means necessary short of torture.
Having been in this game a little back in the old days of SDS/Hanoi Lobby, I know where some of our weaknesses in the laws lie (thanks to Sen. Ted Kennedy trying to weakening the Intelligence Agents Indentity (Protection) Act of the early 1980’s and the Moynihan/Frank/Hoyer, etc. successful efforts to cripple the old Immigration and Naturalization Act of 1954 (Walter-McCarren Act, which kept a lot of communist agents and operations at bay).
Sen. Church (D-Id) was one of the worst enemies of American security in modern history, with Rep. Otis Pike being another fool in the footsteps of Church. The Rockefeller Commission wasn’t much better at protecting the U.S. intelligence system.
Pres. Carter’s pick for FBI and CIA directors, while not bad for some were disasterous with others like Ed Levi as Attorney General (one of the worst in modern history) and Stansfield Turner - CIA head - a complete disaster.
See James L. Tyson’s book “Target America”: The Influence of Communist Propaganda on U.S. Media”, Renery Gateway, 1981, for details.
FISA can be reformed but its’ creational concept is severely flawed. Perhaps it is time to put it to sleep and come up with something that is more realistic vis-à-vis the actual threats we face today.