Nice work Joe. You are doing all the right things and asking yourself the right kind of questions. Keep working through it and you'll have a box you can be proud of. Importantly you will be able to fault find or modify at a later date as you have kept it neat and have a wiring diagram to refer back to when you've forgotten what you did. I wish I had put wiring number tags on my cables and put labels on my diagram - something to think about