Yes, I'm going to try the Walbro TU227HP-2 High Performance Fuel Module Assembly. It does have the return line. I'm still not sure about the fuel pressure regulator.