I had a battery drain due to the light ring around the ignition key. Digging around here on MUD I found it's commonly caused by a bad module for that ring light located in kick panel beside the passenger foot well. After disconnecting the module...
I like the originality and that it's a diesel. The speed of your swapping skills is impressive.
1. How much does the engine/transmission combo weigh (including adapters)?
2. Does yours have an engine brake?
3. Does yours have the stop/start...