I think that the solution for the procrastion is your motivation in makIng games. You know, procrastination is something psicological, so, you need psicological solution. Try asking yourself 'Why I am doing games?', 'What does this project mean to me?'.
Uhh, and also, try to remove all those sorces of procrastination. For example, I'm a little bit addicted when we talk about using YouTube. How do I face that problem? Removing YouTube. Those thinks help a lot.