SK68 clone upgrades?

I haven’t searched but if someone does (or lives near that surplus shed). Here’s what I measure:

Focal length ~10mm (slide moves ~7.0mm but the LED has some space over it. Mine also has an o-ring between bezel and lens that seems to be flattening out so the focus is a little blurred unless I unscrew the bezel a partial turn)

Lens diameter outside ~ 21.8mm and inside bezel is ~23.1mm

Lens diameter inside at convex section ~17.7mm and bezel opening ~17.8mm

Lens height ~8.2mm (total); height at lip ~2.5mm)

There are large and small bezel versions, I’m assuming mine is for the smaller/narrower lens.

Anybody tried polishing the lens (obviously won’t remove imperfections inside the dome)?

EDIT: Might be something out there … glass or plastic? diameter the outer or inner measure? coal length may be wrong …

http://www.ebay.com/itm/1pc-High-Power-LED-23mm-convex-lens-optical-glass-led-lens-/180916486426?pt=LH_DefaultDomain_0&hash=item2a1f76811a

http://www.ebay.com/itm/1-pc-High-Power-LED-18mm-convex-lens-optical-glass-led-lens-/180916468622?pt=LH_DefaultDomain_0&hash=item2a1f763b8e

Anybody got a SK78 to see if the lens is glass and fits (gcbryan said it was just barely larger in old BLF post)?
http://www.leddna.com/sipik-sk78-cree-q3-wc-150-lumen-convex-lens-led-flashlight-black-flashlight/