I went through the exact same dilemma, and from my recent experience, I wouldn’t retake it.
I am absolutely retarded when it comes to physics. I took Calc-Based physics about 10 years ago, and didn’t learn or retain a thing. I never really grasped it back then.
This summer, I took a Kaplan class, it was enough for the MCAT. I haven’t gotten my official scores yet but I did pretty well on my practice tests.
The physics that is on the MCAT is VERY basic, like HS level basic (time is really the issue). If you can solve problems based on analyzing units alone, you can get about 90% of the questions right.
In my humble opinion, take the review course, work the exam crackers 1001 MCAT physics questions, take a few practice tests and see how you feel.
Also, I definitely would NOT retake calculus based physics. You won’t need it for the MCAT, and I found my calc-based books useless for studying. Unless you are a physics genius, the calc aspect will just clutter up your mind, and I found that there is no time for ANY derivations on the exam.