My preference is for covering more scenarios, instead of just increasing firepower. Also, I place greater importance on not altering training, than on upping firepower by swapping weapons (not good to have to think about which weapon you have at the moment, and how to use it).
So, I'll add-on...