I think that the best solution for that problem is to let Sheva keep her handgun and at least give her 1 or 2 more weapons, and the same should go for you. If she starts to run out of ammo then give her the attack command and she will start using other weapons in her inventory. If it keeps on happening then just take the handgun out of her inventory and give her a different weapon.