It's definitely a bit rough to deal with. I've found that I feel much better when I "schedule" which days I will work on for a given subject, and give myself enough time so that I have enough time to fuck off. Some days I do procrastinate, and when that happens, I usually wake up extra early in the morning to complete work from the previous night.
it's definitely tough to hold yourself accountable, but if you try to trick your mind into thinking that there is an immediate reward to your tough work, it becomes a bit easier.