Great post, inquiringmind, lots of good advise!
When you read through the PD literature, you'll find that being mindful and increasing awareness are some common themes. The reason is that you get what you focus on, so you have to control your focus and continuously bring it back to what you want. The problem is that the ego resists and puts up the illusion that you can't focus on what you want. For me,
Negative affirmations has been a great trick to get around my ego.
Here's an idea for your procrastination. Set an amount of time that you will work each week on school work. Then announce that you will pay $15/hour for each hour of work that you do not accomplish. Give the money to your parents or donate it to a charity. I have seen several people become quite motivated by this incentive.