Thanks all,
Just got off the phone with CMA CGM. I've got an initial reservation from Shanghai to Oakland in May 2017, so it's going to be "the other way round". They will apparently confirm the exact dates about 90 days out but they say it will be within a four-day window. The berth is apparently booked at each end but the exact ship has yet to be confirmed. Still an excuse to spend a week or so in California in May - a hard life!
For those considering this type of travel, the people at CMA CGM are very friendly, knowledgeable and enthusiastic.
Now I can start booking the other pieces of the jigsaw and loading up the Kindle.
Thanks for all the great suggestions and the help.