We usually stay overnight in Benicia and have dinner at the Benicia Yacht Club.
You'll want to be careful passing Port Chicago. If there's a military vessel in port when you go by, the Coast Guard will enforce an exclusion zone which will run you aground if you're not careful. (I wasn't careful the first time through.)
The wind against the tide thing is no joke here. This summer we made better time going against the tide than with it.