I believe that Costello wrote 'Shipbuilding' with Wyatt in mind. Whatever, Wyatt released his version first. So I guess it can't qualify as a cover version as such.
On the subjects of Elvis Costello and cover versions, his rendition of the Brinsleys' 'Peace Love And Understanding' is a gas.