Agreed. I will add one thing: I think Colin Powell should also stay in place.
Powell and Rumsfeld balance each other. If either were to leave, there would be an imbalance, and I do not think it would be a good thing. Bush gets good advice from both, he should keep both.
On the other hand, George Tenet's replacement should be Ollie North.