I would disagree with both: as soon as petain took office he had to accept he was the puppet of the occupiers, and the various attempts to turn Vichy into a refoundation of France come across as delusional; Hitler was always going to do what he did, and in fact his state relied on the continuous plunder of war.
For Hitler... should have taken a break before Poland, or at least after France, and not gone to war with the Soviets and made clear that Japan shouldn't attack the US. (Glad he made his mistakes so he was defeated, but just looking at it without the moral lens for a moment.) And maybe just do new, limited, campaigns over the years.
