The trick is to get a breakdown structure that you can see progress from. The GTD, tickets that are appropriately sized, etc. GTD and separating today from your single file everything will help.

Doing what feels fun is always going to create a path where what you want to do will be different than the annoying thing you need to do.