Great write-up. I had the same symptoms and used this to replace both units a few weeks ago, my machine has been running great ever since. It only took about an hour or so to complete. Thanks for taking the time to put this together.
Bummer to hear about your engine/fuel tank configuration. Sounds like the procedure will be a lot more complicated. Good luck.
If you observe life from a creative perspective, everything is art