Return fuel system w/ current parts?
I don't know why you don't just dump the mechanical pump and be done with.
If that thing ruptures a diaphragm and fills the pan with gas.......................
For me, a front orifice / regulator return system is great for preventing boiling / vapor lock. First one of these I ever saw was my old 6bbl 70 RR.