Your plan is fine, but remember, the GMAT in top programs is still a new *thing*. There aren't solid stats on acceptances for GRE scores. The problem you will run into is people say the "GRE is easier", thus even if you score well on the GRE, you must sell your remaining parts of the application to be a competitive applicant.
Strategy Discussion Thread | Strategy Master | GMAT Debrief| Please discuss strategies in discussion thread. Master thread will be updated accordingly. | GC Member Write Ups