1) I am of the firm belief that almost every game can be improved by a dodge roll, but that's just me :)
2) I think it might be a good idea to make picking up the harpoon a click rather than a hold. If you wanted to use a hold input for anything, it might make more sense doing a hold/release to throw the javelin to add emphasis to the feeling of throwing? Something to try maybe!