Heavy attack imput change option

[(XBOX)Project 0R1G1N]

Since the melee change to revert heavy attacks back to the melee button have come back I have constantly held the button a little too long and performed a heavy attack by mistake.  Now I dont know if this is just a me problem or a issue with my controller but its incredibly annoying.  When the melee changes first came around they were only activated by the secondary fire button so I never hit them by mistake but now its constant.  Would there possibly be a way to change it or make it a setting where you can toggle heavy attack on melee attack hold on or off?