Mike;
You've got everything on your list that I would of suggested. I would suggest, however, that anyone who has an interest in any form of transportation, visit the California Railroad Museum in Sacramento. It is really fabulous. It sits right in the middle of Old Sacramento, so the surroundings look like an old west movie set.
Link:
http://www.csrmf.org/
In addition, Railtown 1897, is another fantastic place and everything still runs.
You can see the site attached to the above link. Real neat stuff in it's original location. Many films & TV shows were shot on this railroad including "Petticoat Junction", "Back to the Future III", and the "Wild, Wild, West".
My two cents, but I took my airplane guys to each place (9 of us) when we did the Sacramento show, and even the ones who didn't like the idea were really happy they went.
AND MAKE SURE YOU GO GET AN
"IN AND OUT" BURGER!!!!!!
Jerry