Driver from west — heading that way? (7)

I haven't cracked this one yet — but the brilliant team at Times for the Times have:

W (west) A GONER (heading that way?) To ‘go west’ means to die. Of course the surface is lovely here (and maybe even counts as a semi-&lit) because covered WAGONERs in the United States rode west. I recall seeing a better version of this wordplay somewhere, which was something like “Six feet under, or heading that way? (4,3)”.