Not necessarily. It's just a matter of dis-empowering the people who are on a die-hard mission of "spy on everything, and to hell with civil rights."

That is not the whole NSA; it's just a few key people in leadership positions that have been steering the ship lately.

If you keep those same people in power but split up the agency, yes, you'll just get the same thing again.

Defund them, it's not perfect (as with the CIA and it's ah interesting funding mechanisms) but it is one of the more effective of the least worst options.