And I forgot to comment, looking a the wiring, that you're a better man than I.
One other observation: we bought an extremely expensive, high quality, harness for our BE some years ago that was more of a kit. For our purposes, I should've just purchased a replacement harness as the improvements - for me - probably won't worth the extra money or effort. Definitely no criticism of other choices nor of the supplier, but 'fitness for purpose' is an ideal that is sometimes difficult to determine before hand. And - without being rude! - 'have fun'. Doug