All of these are good suggestions.
The only one that I would change is the torch. Really, each character should be allowed 3 weapon slots and you can just weapon swap. But, swapping/switching weapons (manually or between weapon slots) should take an Action, unless you have a feat that allows swapping between weapons as a Bonus Action.
