Diesel engine swaps - advice required