Getting back on track

Hello,

I took a pretty long break from studying Japanese (~ 1 year) and I must admit that my Japanese pretty sucks now However, I made plans to move to Japan next year and thus I want to get back on track. I think my before-the-break level of Japanese was somewhere between JLPT N3 and N2. I had done the following:
- 2 times RTK
- Elementary Japanese I & II (equivalent to Genki I & II)
- An integrated approach to intermediate Japanese textbook
- ~50% of Kore6000.
- About half of Kanzen Master 2 Grammar

Right now I don't remember much of anything. My goal is to reach JLPT N2 Level by June next year. My plan is the following:
- Start Core6000 and do around 40 sentences per day (thus finished by May, hopefully). This will be mainly for vocabulary.
- Reset/Suspend cards in old RTK deck and unsuspend when encountered "in the wild"
- Review Genki I and Genki II for the basics (~ 4 weeks total) - By mid January
- (Re)do Kanzen Master 2kyuu Grammar (~ 4 weeks, the second time it should be easier) - by mid February
- Textbook: Authentic Japanese. (10 weeks, 1 lesson per week) - done by May

The vocabulary I encounter while working with the textbooks I would unsuspend in Core6000. If not contained in Core6000, add to own vocabulary deck. Is that a good idea, or how would you handle it?

How about grammar? Is it even worth to SRS? I tried to SRS KM2 before but it was a pain the ....

I am worried about the Authentic Japanese textbook, it might be a little above my level. The reason I want to use it is mainly because I have an yet to be used copy of it lying around here. Does anybody have experience with book? Is it reasonable to finish it in 10 weeks with the knowledge I have? Or any other book recommendations? I don't want to go through AIATIJ again, as I didn't enjoy the book very much previously.

Thanks for any feedback!