If I have to retake, I'm going to dust off TBR and print out the AAMC outline. Then I'm going to go through my books and cross off chapters or sections that do not apply to the new MCAT. That way, when I'm studying, I can just blast through the material without constantly wondering whether something is on the new exam or not. I'll probably also buy the TPR psych/soc book and rely on it. I'll take the one practice test 2 weeks before I write the test and polish up on any weak areas.
I don't want to spend more than 2 months studying (because I already studied for the previous one). I'm not sure how I will work out an accelerated schedule while still comprehensively reviewing. I suppose sticking to one source will be the biggest help, and perhaps I'll only do 2/3 of the TBR questions.
I plan to utilize flashcards for psych/soc because a lot of that stuff is pure memorization. I am a psych major and took the sample questions AAMC published in one of their "what's on the new MCAT" books and got half of them wrong. I don't remember specific theories, just broad concepts and major dudes and their theories. So, that sucked.