How about talking to Autosparks, see if they'll make a NAD loom with the mil light switch instead of the civy one. As long as you don't want FFR, IR or convoy lighting it shouldn't be too difficult.
I have a 200tdi loom in bits & what's left of the old mil loom out my 90 if you want it... You could piece together a bulkhead loom from that if it'd help. Can have it, just cover the postage.
D100 5.3 LS powered truggy under construction....