Agree with all of the above but don't take my special arrows away. :P Just make them harder to get
As for the enemies, If they make the AI smarter it would work better for a lot of things. They would run out of arrows in a long encounter and have to switch to melee or run away, just like the player. Limited arrows just makes more sense to me and I say this as someone who rarely does melee in any game.
