Fuel system advice

I am getting to the point in my swap where i need to start thinking about the fuel system. I am using a 95 5.9, OBD1 ,keeping the injection. This engine does not have the return line or regulator on the rail. I am planning on buying an EFI tank and pump from Tanks Inc. Would my best bet be finding an earlier fuel rail with the regulator and return or buying one such as the corvette style reg with a return, appreciate your advice.