Re-worked and proofed wiring diagram.  Much better!

Very few overlapping wires and proofed.  Looks like everything should
work well.
Last working version before re-wiring

New version will need to match up with new wiring / hardware
configuration.