Lz better renew your passport in Ottawa. it may cause trouble when you leave China with the passport only valid in 2 days.
You need wait 30 days for your new passport in Ottawa.
Last time I came back from China, the security officer remind me that I need to use new passport though my passport still have around 1 month valid period. Luckily, it was just reminding.