I think absolutely not. Hitler didn't just conquer territory, he enslaved people and committed genocide. He brainwashed much of the German population into believing they were superior. He had to be eliminated.

As far as Japan goes, the US at least had to ensure that they were subjugated to the point they could not be a threat to the US again any time soon.