Have you tried using a revision timetable? I always used to spend a long time creating one, which was another form of procrastination, but for my A Levels I am using an app called "Adapt," which creates a revision timetable for you within a few seconds. You've just got to select your subjects and it will create one for you and include every module / sub topic. Also, you can make changes to it if things haven't all gone to plan, and it will update it for you within seconds. Again this means that you don't have to spend ages changing it. I've personally found that this is a great app because it gives me the benifits of having a revision timetable, (being motivated by it,) without having to spend ages creating one
I hope that helps! Good luck with your revision! You'll do great!