The "new exam" will still be based on PMBOK 6. If it were me, I would enroll in a new exam simulator and go through every question at least once and do multiple practice exams.
Use the feedback that you received from your previous failures to concentrate your study on those rubric areas. If there are more than two areas of weakness, that indicates that you need work in all rubric areas and you will need to look at all the areas for study.
I failed twice too, i am a exceptionally bright student, which lead me to think i can clear it easily...
I cleared with all AT's in my third attempt today.
I studied PMBOK and Rita and gave 10 mock exams.
Training for Project Management Professional (PMP)®, PMI Agile Certified Practitioner (PMI-ACP)®, and Certified Associate in Project Management (CAPM)®