Thanks for taking the time to post all the details, Mike.
I didn't realize that the tank had a filter screen in it.
It sounds like the fuel system in yours is the same as mine. I was working on it this evening and noticed the accumulator mounted slightly above and forward of the filter. single pump (Bosch)

Thanks again