yeah I beleive your gunna have to swap out your pumps due to the carb. pumps pressure output(i think 4-8 psi), the fi pump will prolly be 40-60psi. Correct me if im wrong. As far as a new engine?, the possibilities are endless. What 2004 engine? chevy Jeep Ford etc...Im sure somebody else will chime in. Good luck with whatever you choose