Option #2 would be the better choice. It would be a good strategy to have an early application at some schools where you could receive interviews with your current MCAT. I suggest these schools initially:
Toledo
NEOMED
Wright State
Oakland Beaumont
West Virginia
Vermont
Quinnipiac
Albany
New York Medical College
Seton Hall
Drexel
Temple
George Washington
NOVA MD
Rosalind Franklin
You can add more schools if your MCAT is at least 511. Post you new score here when available.