Ok - based upon all the feedback and research, MY updated wiring diagram is attached.
Again, I'm doing this for my own enjoyment - as a colored diagram is useful to me. I know if you purchase a kit a wiring diagram is included, but, I'm building my own.