This weekend ended up cold and snowy, so mostly I worked on finishing up the front wiring. Photos will come later, for now, here is the revised circuit diagram. This includes the details of which connectors go to what - this will make it much easier to attach things when in the car:
You can find the PDF here. It is sized to print on legal 8.5 x 14 paper.