In your section about Nietzsche, you said, "And, like many of his
predecessors, he conceived the highest, most noble type of male to be
the warrior--the man wiling to kill for whatever his cause might be."
While this is a very sexist statement, you are wrong about what he meant by warrior. Whenever he spoke of warriors in Thus Spoke Zarathustra, he was referring to thinkers and not fighters.
For clarification, read the section titled "On War and Warriors." This is also a passage that contained many slogans used to support the Nazis, but reading it in its entirety makes it clear that it has nothing to do with fascist rhetoric.
If you read the section after it, "On the New Idol," it'll be clear that Nietzsche would have been outright anti-fascist.