changed countries of residence and job

I moved from Japan to Canada in January 2021. I received payments from my old Job in 2021. My new job is independent consulting. I have been making some quarterly estimated tax payments to the USA, but not Canada. I anticipate filing both US and Canadian taxes for 2021 and not double paying due to tax treaties. Any thoughts on what order I should fill them out in?