Welcome to the search for the perfect light. Be warned, it may mean buying many, and making compromises.
regarding your beam shape interest, there are also diffusing films in the Lee Filter sample pack
I use double sided tape to apply Lee Filters to the outside of the lens, no disassembly required, and completely reversible
I also think MascaratumB has great suggestions in regards to using a TIR, if you are open to learning how to take a light apart.
And once you get started, you may want to add High CRI as a category to include in your choice of LEDs
afaict, all the lights mentioned so far have Low CRI
