I think the current auto-save is good but some kind of timer right before the save could be good. 30 seconds is quite a long time and you have time to forget the whole thing.