I really like you're second post. That's very similar to what I'm doing, and aiming for a time frame about two weeks before yours. I'd say do just that.
Repetition is key I find. You do have time to do DIT, and DIt reads FA out to you. I did it, I liked it. In some ways, it makes it easier for me.
At the end of the day though, its all memorization.
Good luck.