Y07_A66:

I also meant to comment on this -

"I am wondering if delaying the secondary pump cam from #1 to #2 position might help"

The squirter experiment showed that delaying the fuel delivery is not having a positive effect. Clearly the issue is with too much volume. As I remember, using the #2 pump cam position increases the volume, in addition to delaying the start. This is not what you need.

Dave