Hai guys, I really need ur serious opinion

Hai guys, I really need ur serious opinion
I’m a medical student from India who will be graduating this September and is planning for 2022 Match.
So I’m planning to clear step 2CK & CS first in 2021 and give step 1 in 2022 (pass/fail method) and apply for match in 2022.
[ I got a research position in University through contacts for one year in USA- 2020 sept to 2021 sept]

So am I good to go with the above mentioned plan (or) should I make any changes, I would great help to me if someone could advice me on this. Thank you.