....this may not fix this issue but while you're doing a few bits I'd also advise that you find the fuel pump relay, take it out and get some sandpaper on the connections because a pound to a penny you'll have problems with this at some point. Do a search for fuel pump relay as I've done a few answers in this section with regards to that issue.
Reason I dont think it will help with this issue is that the fuel relay issue rears it's ugly head when the cars warm. It did make my old cab cut out while actually driving once and that was quite hairy.