You have not said if you have taken the GMATPrep practice tests. These tests are the best in terms of questions similar to the real test and also in terms of score prediction. Although you have scored fairly consistently across the three tests you have taken (and have scored very well in the Verbal), I will suggest that you take at least one of the GMATPrep CATs and see where you stand.

Regarding Quant, you should go through the OG problems thoroughly, do all of them, if possible, twice. Additionally, you may search online to quickly refer to some additional resources to address your problems in geometry, rates, and number properties. Sometimes there are very good lessons on Youtube which may be helpful for you as well in terms of these specific topics.