I wouldn't include Benedict Arnold, as his disloyalty isn't something we want to honor. It's mostly just straight hate with him.
On scientists/military, I'd add Admiral Grace Hopper, who invented the idea of programming languages that use human words, and the compiler. It sounds obvious, but...