As of 1.21.0, this is still an issue. Maybe add a 4th option that uses the old one instead. Or let the player move each individual button in the customize controls menu.
This is the datapack. Your world must already be open when you add the datapack. Then do /reload and /enchantment and the enchant wont be there unless you relog. Also, this may apply to loot tables and other worldgen stuff but I don't know how to set this up.
MCPE-178387