I don't really mind the difference, but I see your point.

I want to point out that you can remove the lock-on feature from the left thumbstick. Go into your controller config and choose the left thumbstick. It gives you a dropdown list of what to choose. I chose the one that just sheathes/unsheathes the weapon. No more lock-on issues for me.