I know your Whitney trip is just a few days away, but for anyone else in the Bay Area I'd like to add Bald Mountain in Sugarloaf Park, just east of Santa Rosa, to the list. From the parking lot to the summit and looping back on the Gray Pine trail is about 7 miles with ~1600' elevation gain, but much of that is sustained steepness, and there are some spots near the summit that are extremely steep. The descent also contains some steep sections that are good training for rocky / sketchy conditions where poles are required.