Am I on the right track (Step 1 prep)? Thanks

I'm currently at 33% on Kaplan Diagnostic (150 questions and did not prepare for it) and 32% UW (200 questions so far). Prepping for exam in late June 2018. School is still 4 months to go (1.5 semesters) to finish Pathology, Micro, Pharm etc. I'm doing around 20 UW questions a day and 3-5 pages of FA. Will incorporate Pathoma/Goljan and maybe some Picmonic videos. I'm thinking approach 6 week dedicated study time in May with around 45-50% on UW and 1st pass of FA. Then up it up to 65-70% UW... Am I on the right track (Step 1 prep)? Thanks
Source: Student Doctor Network - Category: Universities & Medical Training Authors: Source Type: forums