former

I would take CFAI mock sooner than later so you can pin point your weaknesses better.  Then, if you have time you could always review your answers the day or two before.  Good scores by the way.  I plan on taking samples again this weekend since I took them so long ago I do not remember the questions.