People hate one-shots, yeah?
People love hero identity, yeah?
My solution to one-shot kills while maintaining hero identity goes like this:
Dying to a Widow or Hanzo as a squishy should cut your respawn timer in half. If you can get easily taken out of a fight, you should be able to easily get back in the fight.