As true as my word I've just finished dismantling Gonou.
Everything on the layout was saved. The petrol station, the lighthouse, the bridges, the entire lot.
The task only took about half an hour and in that time I managed to strip the layout all the way down to the cork noticeboard base. The layout has stripped down pretty cleanly so perhaps the base can be used on the sucessor layout.
Where to next?
Watch this space.