I believe that emptying your ranged weapon, switching to melee, then back to your ranged weapon should not be penalized by adding a long, albeit cool, weapon switch animation on top of the reload animation.
In my humble opinion, switching to an empty ranged weapon should start the reload animation, instead of playing both the weapon switch animation and then the reload.
Apart from the gameplay benefits, I think it also makes sense, logically speaking. You would not arm your weapon if you knew it was empty.
I believe this small change would help make the gameplay more fluid, emphasizing the hybrid combat aspect of the game.