313 on PP2 (Q162 V151) – Take GRE in 2 Weeks or 1 Month?

I’ve been preparing for about 7 months (started with GMAT, then switched to GRE) and have completed the GregMat study plan. I am a sailor and I’ve been studying around 7 hours a day consistently. Last week I took a timed ETS PowerPrep 2 and scored 313 (Q162, V151). My target score is 320+.

My quant mistakes were mostly careless/silly errors rather than content gaps. On the verbal side, vocabulary hurt me on some questions, but my biggest weakness is RC. I’m also starting to feel mentally fatigued after such a long prep period.

Given my current score and situation, would you recommend taking the GRE in about 2 weeks, waiting around a month, or continuing until my mock scores are consistently closer to 320? Also, for the final stretch, should I focus almost entirely on official ETS material, error-log review, and weekly mocks?