How about a handcrossbow? Maybe a 6 dart magazine, can fire above or under water, maybe takes same arrows as bow and crossbow to save on ammo types. If you want to be extra add a poison type arrow that uses venom for crafting and adds torpor and DOT poison damage. If not the same arrows as the bows then possible uses longneck darts. Just a thought.