My setup is an Armytek wizard (XHP50) and an Olight mount. I personally would recommend the same type of setup, but with a substituion of the Wizard for a Skilhunt H04RC and swap in an elliptical optic from Yajiamei (if you can remove 4 screws you can do this in 2 minutes)
So
https://www.aliexpress.com/item/32997947541.html
https://www.aliexpress.com/item/32777250737.html
Can’t think of a better setup if you want a multi-use light. My H03 is one of my most favorite lights.