Making enemies with different strengths / weaknesses againts different weapon types is a good call. You will definitely want to add quick loadout switching with a key though, since trying to quickly change weapons with full inventory is not great.
Other than that, I think you have everything else covered. All atributes have both melee / ranged options so that shouldn't be a problem. Only switching between them quickly.
Also, I like that spear. Thanks for adding it.