I've had a lot of problems with the fuelpump it self, as have others. Similar symptoms too, no start, wait a while, runs fine for a long time, then no start again. A new fuel pump has solved the problem each time for a year or two, but then it returns. A fuel pressure gauge will tell the tale when it won't start, and I now carry one.
Agile Ride improvement package