Melee lock range

I feel the range on melee lock is far too low, I’m regularly getting mag dumped by ranged enemies while close enough to them to deal melee damage.
I’m also noticing enemies don’t seem to switch to melee if a teammate gets into melee with them if they are shooting at a target.
It’s really frustrating on higher difficulties when one or two ranged bursts can kill you, especially comparing that with the slowdown you get when shot.
I think the game would benefit from increasing lock range, perhaps even doubling it.