Generally spoken, yes. SST-20 5000K 65CRI was out of question, I wouldn't even consider that for any headlamp.
I just told, that if SST-20 95 CRI range would expand beyond the 2700K-4000K CCT range, that could replace even more emitters as "best default" choice.
Cree seems to be falling out of the innovation race. If I were them, I would also develop the corresponding HI (high intensity) variants for their XHP50.2 and XHP70.2 - and try to do something with the ugly rainbow beam.
XP-L HI warm high CRI emitters are treasure on their own kind.
d25 uses tiny reflectors around 10 –12 mm, i have not seen any single round tir of those sizes. stock reflectors however are fine when led used is a right one, my d25 came with LB leds and had a nasty beam with a center hole. i swapped them for xpg3, and beam changed completely. no more holes.
to answer op question, i’d be interested in 2 at least, any nw led is fine, , and around 620nm red, no deep reds, i build several lights with DR, not as good as regular red, harder to see,