If the 07 engine is complete, I would say just keep the 05 engine while you're doing the swap, but there wasn't any change in L32s between 04-07 mechanically...
There might be a few different plugs on sensors, but that's it. Once the new engine is in the car and running fine, you won't need the 05 engine anymore.
I might be interested in some of the parts off the old engine, if you're willing...