You have the USS Pampanito right there in San Francisco with wonderful FM diesel engines, maybe they will get them running someday. My friends dad ran a few patrols during WWII aboard the Pampanito as a 1st class Motor Mac. The crew nicknamed the boat the "Peaceful Pamp", because they felt the captain was not aggressive enough. Looking back years later they tempered their youthful assessment with "Yeah, but he brought us home." His dad liked the FM diesels and the Pamp, much more than his 1st boat in 1939, the R-17 a WWI sub he patrolled with in Alaskan waters.
USS Silversides cold start Fairbanks Morse.