Should I finish the study plan just before my actual GRE or a few days prior and then revise on my own?
You need to transition to “ets-only” materials before your test, so days or even weeks before is good.
You need as much familiarity as possible with ets materials.