I'm gonna just swap in the whole motor. Although I was tossing the idea around in my head about just throwing on the pump. We know a 3rd gen head will fit on these motors. So then get the 3rd gen injectors, hold down's, harness, CP3, ecm, lines, rail, etc.