Congress has arguably had no meaningful oversight over the NSA since the 50s. Eisenhower warned us. He wasn't just talking about defense contractors. One might say that the US has been pwned by military hackers. I highly recommend Bamford's books.
No. You included the DNI-is-part-of-DHS factoid because you thought that it bolstered your claim that "The NSA is not a military organization.". [0] You were wrong. :)
And I think both you and veonomsnake are grossly underestimating the culpability of Congress in all of this.