npub18994crjwnldrukwym5lz3y2nae84s84v20m2rkngtjnyg549lr6qvxmd6m (npub1899…md6m)
It sounds like you have the basics covered. A light and a switch so you can activate the light without moving your support hand is a good idea on a defensive weapon.
I'd also put a sling on it if it will be a defensive weapon.