How about pausing the Skip settings for the rest of the session, once the End of Project has been reached?
So, grey out and deactivate these:
Once this dialogue box has appeared:
This would make 'things' so much more intuitive ...
Another approach would be: double-clicking on this buttons:
would make them (and the corresponding keyboard shortcuts) ignore the skip settings.