NASA should be disbanded. Inherently government programs (test facilities, launch facilities) shall go to the AirForce. The rest of the programs (research facilities and DeepSpaceNetwork) and funding shall go to the universities.
The bureaucracy around the NASA empire has shifted to a nationalistic secrecy that mostly supports the military not the original and current charters of improving science and technology education to inspire American youth.
Today's Space Race is an international challenge, not an American one.