Eric, "Stitch in Time" is recorded by Martin on "Mighty River of Song". Recorded at the Udazkenean Festival, Donostia Spain - previously unreleased - it says. It's on Disc Three.
I shall probably be playing that version on my show next week. (Already planned - before this thread!!)