I have built some lights with Crees already, one multihead even has 16, 17, 19 and 27 mm XR-Es.
imho there is nothing that compares to the Shoppe reflectors, if You are willing to pay for them.
Within the reflectors, the 19 mm is the best by very far, if possible use this. You will be disappointed with the others.
f.e. those two mods here are totally identical
(the Inova uses a Q2 while the 6P runs with a P4, but except for this indentical)
the 17 mm in the Inova had to be shortened by 1mm to fit into the housing, dunno if this changes much of the outcome.
Anyway, the beam is so much weaker, I really think of selling the light. If I had another Flupic here, I would do it
(the lights really are the same, built the same, using identical Flupic set for 850-900 mA max, same wires, same mounting, same batteries, drawing the same current, ...)
Next best step is the original Cree optic, way cheaper and maybe better suited for beginner mods.
PS: I used the McR-XE and the normal 19mm and both work the same. The normal one offers more material at the base and thus can be glued in easier
as to solder in the Crees:
I solder quite much and find the Cree very difficult.
Now I use a hotter iron (normally 15 W, the Cree with the 80 I have) and put some solder on the bare contacts. I also switched from braided (?) to single copper wire. That way the connections work, but they dont look good