Could a democratic Hitler still lead to war?

If Hitler had become a democratic advocate after World War I, would World War II still happen?

Probably, in this tentative assessment, because German army and naval rearmament would continue even if Hitler advocated democracy.

A Hitler who championed democracy after the First World War would have to persuade voters to accept complicated policies. Nuanced solutions take time and money to explain, while simple answers to every problem are easier to sell. Changing his political outlook would still leave the German army and navy rearming. The answer leans towards war still occurring, but explicitly leaves the outcome uncertain.