I'm leaning toward the fuel filter. It sounds identical to the problems I was having. Actually I still am because I haven't gotten my new tank yet, but the crud was plugging up the fuel filter and the symptoms were exactly what you are describing.
Dave
