I can offer zero support on any other engine suggestions, but I would wholeheartedly swap any new components from the original engine to the replacement engine in a heartbeat.