36Q is probably due to not remembering a lot of your High School math. If I were you (and I am almost on the same boat), I'd work on getting my fundamentals up to par. Perhaps purchase
MGMAT's strategy guides and/or GMAX Online. After your fundamentals are solid, the way to improve is by practicing from OG, which you'll also do by following the above mentioned resources, and by taking CAT's. Gmat Prep and
MGMAT's CAT's are the way to go. GMAT Club's "challenges" are also great practice to increase your Q score. Try not to be satisfied with just working through the problems, but also understanding the details behind each question - why an answer is right or wrong. For Verbal, I'd go with SC Strategy Guide from
MGMAT and Powerscore Logical Reasoning Bible for CR. You'll get access to
MGMAT CAT's with the purchase of any Strategy Guide. Lastly, and perhaps equally important, reading through this forum will help you a lot by learning from other people's mistakes and achievements. Hope that helps.