Many Jews fled Germany under the Nazi-regime in the thirties, and one assumes they'd have continued to do so if war hadn't started. Perhaps in the end he'd still have engaged in genocide on the Jews that stayed behind, but I think that's unlikely. The Nazi-regime did actually consider some plans of mass expulsion of Jews at first, it's not like they were genocidal from the start, at first they merely wanted them out; it's not until the invasion of the Soviet Union in the summer of 1941 that they actually started engaging in genocide, and not until the Wannsee Conference of January 1942 that the plans for the extermination camps were begun. If they would only have had the German Jews to deal with, minus the ones that had already immigrated or fled of their own volition, perhaps the mass expulsion schemes would have worked - or perhaps they wouldn't even have bothered, accepting that a small number of Jews remained in Germany. Who knows.

So yeah, you can't see the Holocaust as separate from the war. It was to a large extent Polish and Russian Jews, plus smaller numbers from other countries, who died in the Holocaust, but without war those people would never have been in Hitler's hands.

Bottom line, alternative history is too complicated to engage in it just to make simple points. But any attempt to look at Hitler's Germany without the war is going to be a lot less spectacular and proverbially evil than it's considered in reality, and a lot more comparable to plenty of other dictatorships.