I'd say that your issue doesn't need a organizational solution, it's a deeper question.
I go by "when why gets bigger, how gets easier".
I would suggest sitting down and writing out 100 (or however many) reasons for what you are trying to accomplish. As you have those done, your motivation will grow and get you past the little distractions. The more reasons you have for accomplishing your goals, the easier it will be to get desciplined.