I got started on my original B-33, so now I am committed to making a more better brace for the new transformer. I am much happier about the wiring now. I am keeping the blue power switch wiring, its okay though not thrilled about it being blue.
The 3rd photo is the transformer I took out. It's wiring has been exposed and the line that has white shrink tube wasn't connected (on the other engine was tied to go to the power).