Hitler wanted a war against Poland, and said openly in the last days before the war that his last fear was that a "pork" would once again barter a last minute deal (thinly veiled reference to Mussolini's diplomacy which led to Munich. Hitler believed taking the deal was a mistake till his final days and that he'd have won a general war if it started in 38).
Of course he wanted a local war against Poland, not the war of Sept.3 (yet). He wanted to gain most of Poland, a border with the Soviet Union, and more importantly, to test his army in battle and show the world that Germany was a power. He wanted blood.
If the Poles had folded, he'd have demanded the 1913 borders right away. Only if he obtained that bloodlessly would he had been, I suspect, forced to back down.