If your procrastination is working against you, work with your procrastination instead. I was really into Roller Coaster Tycoon 2 and Pokemon in high school, and that always made me not want to study. So, instead of turning everything off and dedicating myself to my books for a couple hours like a good student, I started naming my various roller coasters after important facts I was supposed to know. It might not have been as effective as studying outright, but it got me looking through my notes and the act of thinking about your studies while playing a game that you normally used to escape said studies worked relatively well. It made it more fun, and I would "study" for hours on end. It might not be your ticket to straight A's, but if you're fine with a few B's, then it was good enough for me.
Plus S=O/H, C=A/H, and T=O/A (my triple racing coasters) were some of the biggest hits in the park. They brought in a lot of money, and a higher grade in math, haha.
In other words, make studying a game. It works wonders.