That would objectively be an improvement, absolutely

Shutting down spy agencies in democracies will not stop spying done by autocrats. If anything, it will create greater incentives to attack more, not less.

I think drawing direct equivalence to the CIA and what the FSB get up to is a little strong. It's a popular thing to say on HN, but if it were true it would mean there's evidence of (say) finding the CIA planting bombs the day after 9/11 in a different skyscraper i.e. The Moscow apartment bombings.

Mass surveillance is a different matter, although I don't think that (nominally at least) falls under the CIA's remit