بسم الله الرحمن الرحيم
(1, 2) It is also important to offer waqtiya sunnah muwakkidah; hence you should not miss sunnah muwakkidah and keep on offering qaza-e-umari as well. Yes, you may offer qaza-e-umari instead of sunnah ghair muwakkidah.
Allah knows Best!
Darul Uloom Deoband
This answer was collected from the official ifta website of Darul Uloom Deoband in India.