I think the list of noncontroversial items is an excellent starting point. Most of this discussion has been over only one set of items; there's plenty else to do in the meantime.
On the Swansea idea, let's at least allow the shipyard to be general and not a Bowex shipyard. It's awkward enough that Gateway has to go to Scarborough to get its larger vessels.