Looks like a real mess. Glad you cleaned out that rat's nest before you had a fire. Most homeowners, when they do their own wiring, either do an awful job or an excellent job. Our inspectors tell me they either fail right away or pass with flying colors. Post some 'after' pictures!
How true is that! When I built my own house, I asked a load of questions from the BI and he was always straight up with me. Passed the rough-in and final inspection the first time through. When we were talking when he was getting ready to leave said what you did...glad I was on "that" side...