Fenix body interchange?

Hi everyone, I have been lurking the forum for a few days now trying to decide on my new light. I decided on the Fenix LD20 R4 and ordered it today. Now I know that you used to be able to interchange the bodies between the L1D and L2D since their only difference is the length of the body tube. With the revisions to the LD10 and LD20 they changed the threads so they aren't compatible with the older models. I haven't been able to find the newer LD10 body to make it a little more versatile. Are they available separately and if so where can I find one? Any help is greatly appreciated.