Yes of course you should apply for renewal and wait & watch till July. If you feel travel is not possible even in September then you can ask for extension. Anyway passport renewal is important. Even if travel happen by September, you have to apply for renewal in Canada which is even more expensive.I am in the same boat. My parents landing VISA expires in September and i dont think they can land due to COVID. Their passports are expiring in Feb so even extension on the passport will not be possible. Let me know what should i do apply for new passport and they extension?