> I just reduced the outside of the reflector base to clear the solder points.
excellent option
I agree its a pain to sand the centering ring… I use a block too
I dont know the answers to your shaving and authenticity questions
here is an LED type lookup:
I hope you get the beam dialed in
ime the cross in the beam, is definitely related to reflector to LED spacing, and not specific to the LED you chose