With a PoD after 1795, have Prussia keep New East Prussia and South Prussia to the present day. Germany must still exist and not be the 'bad guy' in any world wars that may occur, and is not a repressive regime. Poland should still exist, but be based on Galicia and the rest of the eastern second Polish Republic borders, capital of Lublin or Lviv.