At quick glance, your second schematic looks correct. I would still recommend validating it against Vikki's posted schematics. Once you learn her site, you will dump the Chiltons.
I downloaded the firsgensite's schematics last week. Looking at too many versions - I confused myself.
