I do something similar to your first approach just as I'm about to context switch (either because the day has ended or I have to work on something else).

I write a small summary of what I was doing and what were my next steps at the time, and I write this either directly in the code, in paper or sometimes in a text file. I call them ENDSNAPs (end snapshots).