Hello Brian - just a small thing about the 47 tanks which might not be possible/ worth altering but as 47091 is an AP wired machine I think the conduits from the battery boxes to the generator should run differently to how they are on your model? Currently they run as on SP wired locos like 105.
Kevyn