I have melee weapons doing variations of a physical strength roll plus some number of points. That seems ok and makes players nervous, but the guns just don't. A D4 damage pistol is nothing. Numerically that may be right for the airsoft but not for a game.
I am currently reworking the equipment with a mind for creating something that is useful for combat. I am taking the SCRUM ideas from work an setting up a series of use cases that need to be reflected in the rules. Thinks like a sniper killing a person in one shot or the grenade / baby thought experiment from Shadowrun.