Just use the z6 engine. You'll have to cut the timing covers for the driver side mount to fit (use the mount from your original motor). Its a EASY swap. I do them in under an hour.