Enhancement (PS3): Sheathe/Unsheathe using its own button

After much hotbar customization I managed to make a targeting setup that would be just nearly perfect for me if only the sheathe action wasn't tied to the lock. Which messes up everything.

Simple example: I am unarmed and I get attacked. I press L3 and instead to draw my weapon (and thus switch hotbar) I lock the enemy without a chance to do anything.

But that's not the only one. Am I the only one that would like an option to bind ONLY the Draw/Sheathe weapon action to the L1 button where it should be meant to be for consistency with many other games? Why has it been tied to the lock on first instance?

This game is great but there are so many little dumb thing that make it hateful. This, the unsorted inventory, the lack of "ignore" user in the chat menu, etc..

I dont mind it really, I dont have my settings to automatically attack what attacks me, and..... if I do happen to target them before unsheathing my weapon I just unselect them and L3 and continue as I was