Finally gave up on fixing the problem myself and took it in to a shop to troubleshoot the problem. The tech called me this afternoon and said he had my problem taken care of. Seems the air was getting in the system through the electrical connection on the fuel preheater. He said he had seen several do this so just trying to give others a heads up in case someone has the same problem. While I had it there I also asked them to advance the timing, he said when he checked it was advanced way to far and off the chart. I guess it was a good thing I had asked for him to do this after all.