Don't forget that the 07 PCM, cylinder lock and keys belong together, just like the 05 ones do. So swapping the PCM and trying to start the engine with your 05 key will not work because that key is not programmed into the 07 PCM.
I would leave the 05 PCM in there for now. You are on a tight schedule here. If the engine runs and all lights in the instrument panel go out, all sensor values are valid and things are fine. You might swap the PCM later, but then you also want the 05 key programmed into the 07 PCM because the 07 key does not match the doorlock. That is all tricky stuff, and it would be better if you embark on that project while you have more time and know you new engine works as expected.