Couple of things....
Any twin light headlight shell is likely going to cause you some problems if you still have the OEM lighting coil.
Some of the strap-on types have straps that are designed to fit USD forks. You can make-up a spacer of some type (I've used dense foam blocks) if you use the larger strap on the smaller conventional KDX forks.
You're OEM bulb will not fit in any aftermarket shell that I know of.
...doesn't mean it doesn't exist.
You will need to do some rewiring.