Wow. Big similarity between the ethnic disunity you describe in pre-WW2 Poland, and Ukraine today.
Well the one silver lining was that as harsh as the ethnic cleansing was, it did avoid the same problems that plagued Europe before the war.
Poland was virtually all Polish, the Germans were out of Czechoslovakia, Ukrainians were in the Ukrainian SSR.