Given National Socialism, war was inevitable between UK, France, Russia and Germany. There was no avoiding it...the dynamic of NS simply drove Germany into expansionist wars.
With no NS in Germany I see no need at all for a new war, any more than France and Germany would go to war today. Sure there would still be the reoccupation if the Rhineland and a future argument about the Sudeten region, but not full war in Europe.
The war if it came would have been one of resistance against an expansionist USSR maybe in the late forties.
Japan's war, is problematical...they relied on the colonial powers being pre-occupied by the European war. If that never happened I feel they would have been hesitant in attacking the Southern Resource Region.
But who knows?