I may be responding too late to make a difference given the timing, but I would encourage you to take a deep breath and consider whether pushing your next attempt out a few months might be the better option. As others have pointed out it is certainly possible to see improvements in a short amount of time if you go about things the right way, but given that your scores are pretty consistently on the bubble between passing and failing and you weren't able to see a big improvement between your first two attempts, I don't know that it is realistic to expect a big jump with only a couple of weeks to prepare.
As they taught us when I was in the Army, "slow is smooth, and smooth is fast." In other words, sometimes taking the time to slow down and go about things the right way will get you to the desired goal faster than rushing through the process. Yes, delaying the exam means that you'll have some work to do to adapt to the new content, but accepting that will also take the pressure off of you to quickly cram for the old exam. That pressure isn't likely to help your performance, whereas taking the exam two or three months from now under more relaxed conditions (and with plenty of time to identify and work on your weaker areas) could make a big difference.
Obviously there are a number of other factors for you to consider, and you'll need to make the decision that makes the most sense for you. My best advice is to ask yourself whether the pressure you'd be putting on yourself to take the "old" exam is worthwhile, or whether you'd simply be running an unnecessary risk of rushing to failure.
