I tend to wire all the lights that are in the shell for either steam or diesel and bring them to one connector that goes to the frame, makes it easier to manage the wiring. OTOH, you don't have that many wires yet.
Here's a typical diesel install, this is the WBB Trainmaster. The shell and the frame, and then the wiring diagram.
