Long story short, I was hoping it’d be done in Beta, I’m still holding out hope.
What I’d like is a simple change of names, so these weapon categories become Harpoon and Speargun. Just that, no changes to the actual weapons (those already often are like that).
Why? Two reasons. The first is that Spear doesn’t shout “aquatic weapon” to me, while Harpoon does. The other is that this would allow the creation of a Spear weapon category for terrestial use at a later date. C’mon, we want our one handed melee/ranged weapon for warriors and rangers!