Should I buy Hitman 3 base game and its Hitman 2 Expansion Access Pass on Steam now?

I was going to buy Hitman 3 Trilogy on Epic, but after hearing the news about the free World of Assassins upgrade, I was wondering if buying Hitman 3 base game and Hitman 2 Expansion Access Pass on Steam means by January 26th, I will have all the locations content in Hitman: World of Assassins? (I'm not too interested in Seven Deadly Sins and the Deluxe Escalation content, I just want to have the full Freelancer experience).

P.s. and yes that would mean abandon my progression on Epic sadly (was able to master Paris and Sapienza, as well as completing ETs from H1 in H3 Free Starter Pack)