Be aware that a lot of the Lighttake "Solarforce" lights are not genuine, including the one you linked to. The real Solarforce lights don't have lanyards. Actually I'm glad to see Lighttake no longer advertises these as Solarforce, just L2, even though the pictures still show the Solarforce lettering. These fake L2's are pretty much the same as the Ultrafire 504B. Not bad lights (especially if you want a lanyard), but not true Solarforce.
Also, the drop-in is a P7 LED intended for 6V maximum, so two 18650's like the extended L2 you have picked out will take, will be too much. Also a lot of time the P7 has a + in the beam or a dark center due to the layout of the 4 individual LED's. I'm not sure why ITC is talking about SST's, but you wouldn't find a SST drop-in that cheap.
I bought a black version of the extended L2 from Lighttake and I have yet to get a drop-in that takes 2 cells (most take one cell). So I've never used it (except with the extension off).