Help design a new thrower headlamp

I’m working on a dual LED headlight: Build: Dual XP-L headlight project.

The light in stock form has a XP-E LED, and my domed XP-Ls are no where near matching in it throw. I’m considering trying out XP-Ls and XP-G2s with sliced domes. For climbing use I don’t really want pencil beam throw, just a little more than the domed XP-Ls.