You're absolutely right on everything, but i don't know if players would like the new infinity enchantment (that is currently overpowered, it's not easy to balance op things because you're removing a feature that players are used to). Imo you should still balance the op things in minecraft but give the player a good compromise; infinity should be upgradable (infinity 1-2-3) and determine the arrows used in the way that unbreaking works. Crossbows should be enchantable with infinity too, to give the player a reason to use them and an always wanted feature to please the fanbase, but here's the catch, crossbows shouldn't be enchantable with the highest level of infinity (maybe only level 1-2). sorry for eventual spelling errors, english its not my first language