For anyone suffering from constantly falling into Option 2, my solution for the past decade has been pomodoro timers (30 mins of music).

Once I hear the music, I just focus.

Then the music stops, my brain and focus stops. I either relax, procrastinate, or restart the timer.