I would use all the FI stuff since you have the pute(everything)onbord already.If possible I would replace the rings on the replacement engine,and just use the shortblock.What is wrong with the engine that is in there?