Hi,
I am an incoming student of the UChicago MSFM program this fall so probably in the same boat as you are but I'll give you my 2 cents.
I have a very similar profile as yours. I think you can target high ranking schools with these scores and you don't really need to take the GRE again. Plus a lot of schools are already making GRE optional and a lot are planning to do away with it so keep that in mind.
Instead, I would suggest to spend that time doing online courses in maths, stats and programming if you think you didn't have these in your undergrad or didn't score good marks in them. There are a lot of interesting courses on MiTx, Coursera etc and the QN C++ programming seems to be the gold standard in the academia.
As for the course selection would suggest to figure our what kind of a career you want to pursue. If you are dead set on working in a quant finance role, quant finance programs will be a good fit although you will have limited (but not zero) options to purse general data analytics/science roles. However, if you want to keep your options open, would like to work in industries like supply chain analytics, customer analytics or market analytics in addition to financial analytics, a business analytics program will be better.
Key take away from this: think very carefully before investing any more time in retaking the test, can do more harm than good in my opinion. Instead focus on searching what you wanna do after the program and spend time on creating your story which will hold much more value.