Currently, if you reload, then try to switch to another weapon, it finishes reloading the current weapon, and then immediately starts switching to the second weapon without giving you a chance to fire for an extended period of time.

It would be best if it would just immediately interrupt the rifle animation to switch to the second weapon. But at the very least, it should cancel any attempts to switch weapons while reloading so you can choose whether you really want to switch weapons after realizing you must wait until the end of the reload animation either way.