To avoid procrastination, build more discipline - relate to your task list. It should be a single source of tasks which you often look in to synchronize.
If a task can be done less in X minutes, do it immediatelly, without writing to the tasklist. Otherwise, write it down. If a written task takes more than Y minutes, decompose it into smaller tasks. For me, such X is about 2 minutes, and Y is about 1 hour.
Bigger tasks impose procrastination. Smaller tasks are easier to digest, and more importantly, it’s easier to even start doing them. And it’s well known - the hardest part is to start. Then you get into the flow.