Modding TLE-300MR

Hi guys... Since everything here is now only about XP-G and SST led's i got an idea about modding my terralux TLE-300MR drop-in. I would change the xr-e q5 emmiter with the new XP-G R5. I know i would have to change the optics too. Original is about 12mm high, and has 21mm diameter.
I was thinking about this R5 PCB

http://www.led-tech.de/en/High-Powe...CREE-XP-G-R5-on-mini-PCB-LT-1598_120_138.html

And this optics:

http://www.led-tech.de/en/High-Power-Supply/LEDIL-Optics/CREE-LXP-optic-10%C2%B0-LT-1561_106_146.html

Would these two even go together? (Would optics sit nicely on the PCB-to the bottom of the heatsink?) If not, i would use a plain emitter(pain in the *** to solder...)

Ledil optics here are about the same diameter(+/-0,5mm), but little higher; This is not a huge problem, i could shorten the plastic "pillar" and change the metal screws with a longer one...



Would leds be efficiantlly (and safely!) driven like original q5's were?
And one, noobish question. Are LEDs electrically isolated at the lower part, or are there two "strips" where the led can be soldered?

If someone has any advice, i would really appreciate any help... Thanks in advance guys!