Just reviewed your diagram. Thanks for all the hard work.
I have a US delivered car with pop up lights 8MA930. I puchasedthe car new and sold it after a few years of ownership.. I bought it back a few years ago . This car has an electric fuel. I assume they all do??. The pump is not on your drawing.
Did the earlier cars not have an electric pump?