Had a quick look and don't think I've got a solo version. But according to one source the version on Disc 2 of RT: The Life And Music Of Richard Thompson was recorded especially for that set, so if anyone has that version it should be easy to check; I would assume that what he sings there is what he wrote.

Mick