GMAT Strategy

What do you guys feel is the best strategy for the next 30 days of my prep? I'll describe my progress so far and what I feel are my weak points:

- started a few months ago studying very leisurely (just the basics)
- did poorly on CATS (550, 560) - timing was a huge problem
- did PR math workbook, took GMATPrep 1 and scored 650 with a big increase in math (34 to 45)
- started really studying harder with Veritas online course, went through about half the lessons and stopped those to focus on OG11
- changed studying from doing lots of practice to doing sets of problems and going over every solution --> hit rates were in the high 80s for V and high 90s for Q
- took 2 more CATs (570,540), realized timing would forever hold me back if i didn't overcome it
- spent a week doing old paper GMAT tests timed (680, 660)
- took another CAT 660 (Q42, V40)
- started doing all practice sets in OG11 timed
- realized probability, combinations and permutations were big gaps in math --> did Veritas lesson on these
- still working on OG11 (finished CR section - 89% avg hit rate)

I've been very indecisive about the next few weeks and haven't decided on my plan. Here are my thoughts:

1) I think my V is about as good as it can get in CR and SC....RC could use a little more work, but I think I can get a 40-45V
2) I think my math is weak still even though I've been scoring in the 40s fairly consistently lately --> I made at least 4 silly mistakes out of the 9 problems I missed on the last CAT
3) I need to keep working on my timing

So I'd like to ask the usual suspects (Stacy, Eric, aim-wsc and others) for their opinions on the best use of my time based on what I've described above. I've been thinking about covering all these books that I have left to cover (kaplan 800, OG V, OG Q, MGMAT SC), but I'm not sure if that's the best use of my time. I have access to the MGMAT CATs, but I don't think I'll have enough time to do them all. Eric and aim have mentioned doing more official practice problems and doing CATs. I have two main ideas right now:

1) Finish OG11, complete MGMAT SC, complete Kaplan 800, do hard problems from OG V and Q, do 1 CAT each week (2 MGMAT and GMATPrep 2)

2) Finish OG11, do all the MGMAT CATs for practice with hard Q questions (2 per week), spend any extra time working OG V and Q review (focusing on hardest problems first)

I'm leaning towards option 2 since it will allow me to practice with the hardest problems and work under timed conditions.

Thoughts?