Here's an updated diagram of my fuel system. In order to keep under size limit I had to reduce quality, so there is a google drive link to a better quality version.