Perfect fix, thanks. Actually I realigned all the damage last night, it hit me that this is the way to go. Everything remains balanced, and guns are preferable to archaic weapons.
EDIT: 5e is kinda cinematic by default, we want to keep this, or choose the gritty realism DMG rules if we want...