I have the NUGM06 diodes which do well over 2 watts but they are "g-ball" diodes... However, I've finally found a source for the diode caps and will hopefully have those soon.
Although very similar, that does not appear to be the same driver. Are there markings on the bottom of the driver as to what model it is? Perhaps it's a very early version. I compared your picture to the drivers I have on hand and they are definitely not the same. Mine look just like the stock...
Is is a Buck or Boost type driver? If it's a Buck then you will need two cells, especially because green diodes tend to have a higher forward voltage. Two 18350 batteries will usually fit where one 18650 battery was.