As you're spending money on an engine rebuild, also chuck some cash in the direction of a new fuel filter, check the condition of the fuel pump and its wiring, the condition of the fuel lines, and get the car set up properly afterwards.