Hope this clears it up for you.
You might want to rotate your photo 180 degrees and start looking at the guts from that orientation. Most of the wiring diagrams are set up that way and you may get confused comparing the two. Just a thought. I found myself standing on my head to look at your photo while I added my notes.
Keep me posted on how the upgrade is going.