Wrong story on the tenders - off the top of my head (and subject to corretion):
NCNG #7 was an xC&C 4-4-0 that got one of the small NCO whaleback tenders out of the deadline when SP sold it to NCNG. NCO's early engines had rectangular tenders, but later got replacement tenders or tanks (homemade or Baldwin?).
After NCNG bought #8, the tender was found to be unuseable due to rust and corrosion, and NCNG needed to convert it to oil anyway. (Did they even bother shipping it to California?) So NCNG took the tender off #7 and gave it to #8, and then got a rectangular tender off of a retired NCNG engine for #7.
NCNG's master mechanic Johnny Nolan went to Mina to inspect the NCO#14/SP#1, and made arrangements to purchase it. Later looking out his motel room window at his purchase, it dawned on him that it was too long to fit on any of the NCNG turntables. It was shipped to Colfax with a rectangular tender (out of the SP or NCO deadline) which was also too long, so SP sent another tender that was short enough. (Sound like Goldilocks made this deal?)
The whaleback tender off NCO#14/SP#1 ended up behind F&CC#22/NCO#22/SP#22, and was scrapped with it.
NCNG #8 and whaleback tender went to Plaster City, where they were scrapped after the arrival of the #1203.