Just in case anyone else is interested the engine swap process is pretty straight forward, the Z3 platform is all plug n play. It’s easier sticking with the same engine type if your swapping.
Example - M52 for 2.0 & 2.8 or M54 for 2.2 & 3.0. Those looms cross over between engines.