I think that's fair enough Korgoth, they shouldn't magically change. However, I think you should be able to pick up heirloomed arrows at least and I also think that if you pick up a new type of arrow and your others are empty it should change those arrows, rather than replace a random weapon (if that's possible).