Major Spear rework

Many players have complained about the spear and its mechanics, most notably the hunger consumption on Lunge. My issue with the spear is its damage. A netherite spear does 5 damage with a jab, while a netherite pickaxe does 6. It has the slowest attack of any tiered weapon, and in exchange, it gets a little bit of extra range. Meanwhile, the charge attack is capable of doing 40 damage in one hit when you attack whilst using elytra and rockets. There is a major disconnect here, where one side is too weak and the other is too strong. I suggest adding a maximum charge damage cap of 25 to the spear, and in exchange, increase the jab damage of each tier by 2, making the damage match Bedrock's axes. This would put the spear in a comfortable spot between axes and swords: axes for single hit damage, swords for continuous mid-range damage, and spears for longer attack reach without compromising too much damage. My last request, though this is a bit of a stretch, adjust the attack speed of the spears so that netherite would have an attack speed of 1.