This one's always been a problem. A simple, if perhaps inelegant, houserule solution: on a point-blank shot where the shooter has time to line up the shot and take good aim (thus not in the heat of combat) any hit prompts a save-or-die from the target. On a made save, damage accrues as normal...