IMO the answer is "highly likely" to both.
Assuming that Goering makes the same sort of coup de etat that Hitler did, then he is charge.
I can see the remilitarisation of the Rhineland, repudiation of the Versailles Diktat and Auschluss all happening - as there was much grassroots support for either it.
Now Munich - that's a Good Question
A "no Hitler" WWII is quite questionable ...
As to which murderous psychopat rises to the top in Moscow - I've no idea.
With a weaker grasp on the country, would the Chairman cross ideological lines and make a deal with Goering (if Fatty is willing), thus starting WWII?
No.
Germany pre-Hitler arleady have anti-polish alliance,they would eventually start war.
And soviets wonted conqer entire world no matter who ruled there.It is like with killing Putin now - as long as KGB rule there,politics would be the same.Evry soviet leader would start WW2 with alliance with Germany,and later backstab them and try take entire Europe.
Only difference - any semi-competent german leader who attack soviet first would win,thanks to hate which soviets have for their leaders.