Honestly that’s where I would start. It takes some “no I’m in the driver’s seat, I decide what I’m working on, I decide when I’m done” reminders so I’m working on the right things, but I don’t really procrastinate. Unless it’s something I really don’t want to work on, but that’s kind of a different problem.

If they’ve worked well in the past beyond the initial break in period I know some people do well with short breaks. Five days on, weekends off, though I would want to be functional outside of work days.