I don't really like the current system of repairing weapons, it doesn't make sense to me. When a weapon needs repairing, what exactly needs to be done to fix it and what is in a weapons repair kit? I imagine that most of the 'repairing' would just be sharpening, in which case a whetstone would be the major component of a weapons repair kit. But in RL, whetstones can be used many times. Also, when crafting weapons players use a sharpening stone. This implies that the use of sharpening/whetstones is a skill acquired in the weapon making skill which makes the weapon repair skill redundant.
A solution that I would like to see, is long-lasting whetstones being introduced as a mine-able material (near the river, in sedimentary rock). Whetstones should not be sold by NPC's and they should be rare enough that they fetch around 5000t on the open market. Weapon repair kits should also be completely removed.
A solution for the problem of overlapping skills is one that I haven't thought of a solution for yet, but I'm sure other people have ideas.