Rbeckett, I think you just answered my concerns. I rushed (obviously) through this project and worked on it during a sleepless night and tried to save room in the box by cutting some corners.. I think if it were more organized, there would be no question on the wiring. I do have a copy of the diagram here and understand the flow of electricity in this box. Anyway, since I'm out of commission for a awhile I'll take a break from it and revisit it later.
One thing I did learn is this is a lot harder than it seems!! for me at least.