I think without Hitler, the Nazis don't rise.
Although the Nazis were far more than "Hitler and his henchmen" most (if not all?) of the key figures in the initial rise of the NSDAP to power were attracted to the party by Hitler's oratory. Absent Hitler, there's every chance the Nazis remain a Bavarian fringe Party and attach themselves to whatever right-wing Autocratic regime rises ATL.
Personally, with the anti-socialism (it went far deeper than 'simple' anti-communism) rife within the Heer, for me there is no real chance of a Communist or even heavily Socialist German government. Once the Heer supported (backed?) right-wing autocratic government takes power, with the geopolitical drivers of a German government of the era (reclamation of 'Prussian Poland', the Danzig Question, possibility of Anschluss with Austria and a general want to 'deal' with Soviet Russia) I believe there will be a War of some kind or another eventually. Whether it's a "notzi" War in The East or WWII*, I'm not sure. The absence of the various Nazi idiots from high Government positions will mean there is a chance that many failures of the OTL German war effort won't be repeated, possibly even a better foreign policy as well. The Holocaust as we know it will almost certainly be butterflied away (life for the Jews of Eastern Europe won't magically become roses and fluffy bunny rabbits, but Konzentrationslager will probably not be a thing (for Jews at least - for Soviet Russians, maybe) and other aberrations such as Aktion T4 will not occur) but War will still be horrible by any normal moral mores.