Assuming you are applying next cycle:
Don't retake. You have a strong app for top- and mid-tier MSTPs. Anything is possible, and the general advice applies (apply broadly and early) but I'd be surprised if you didn't get a handful of top-tier MSTP interviews and an acceptance. I'd advise option (2).
If you makes it feel any better, I have several classmates that matriculated to our top-tier MSTP with similar stats.