I'd take the new MCAT
BUT, I'd study like crazy for it. You say your masters program ends in 2 months, so are you really giving yourself adequate time to prepare? You need to do well on it so plan accordingly, and take it in 2017 if need be. This next time needs to be good enough to be the last time