Please test revision #21419 or newer. Inkscape should now also save the window geometry when you save through the data-loss warning dialog (your second scenario).
Please test revision #21419 or newer. Inkscape should now also save the window geometry when you save through the data-loss warning dialog (your second scenario).