I think you are on the right track but I would try a fuel pressure test and volume test and guessing from what you said I would try a fuel filter possibly a cam sensor or crank, doubtful though. Login to read more.