I wish I could be as sanguine as your post about the CIA. From everything I've read this is still a much too bureaucratic and dysfunctional club. They see themselves as a status quo that remains in place when administrations come and go. There is even an anti-Bush faction within the CIA which orchestrates leaks and innuendoes to undermine any policy the "old boys" don't like.
The CIA hasn't ever fully recovered from the Church Commission in 1976 which neutered and destroyed its on-the-ground counterintelligence capabilities. It's ethos is now that of PC.
The latest example of its intelligence ineptitude was when Tenet told Bush Iraq was a "slam dunk." Read Bill Gertz's book "Breakdown", which details how the CIA's intelligence failures had much to do with the 9/11 catastrophe.
Unfortunately, it take a very long time to establish (or reestablish!) an effective intelligence agency, but very little time to tear it down.