Gadget resupply times too long

Gadgets like Grenade/Thermobaric launcher, Incendiary launcher and mines take too long to resupply using the resupply bag.
While i absolutely agree that they should not be spammable, currently its faster to die, wait 10 second cooldown, respawn with 2 fresh ammos with launcher is faster than replenishing one round of the launcher using the resupply pack. I think that is bit unbalanced, while resupplying a second weapon, or the incendiary shotgun gadget as assault is virtually instant.

I tried to do the Assault class challenges, where i need launcher kills, ended up redeploying instead of resupplying for majority of it. I think that is against the core idea of the game or the challenge.

I do think it can be slightly longer than 10 second if it replenished 2 rounds instead of 1. I don't have the exact times for other gadgets, but other than Anti tank launchers, gadgets resupply from the support bag could be faster.