Volvo XC70 2009 xc70 engine swap

I have a 2009 XC70 and have just swapped my 3.2 for a 2012 3.2 from and XC 90. I know there have been some changes, but still the same motor. Worth stating, this is only an engine swap, all loom connections and electronics are original to the car.

Everything went well, and all connections are made using the old harness.
Thing is, when I tried to start it, the PCC got locked is it’s slot, the computer thinks the car is not in Park, it is, and the ignition will come on for five seconds, and go off again.

Obviously can’t use an analyser as the ignition won’t stay on.
A mechanic mate, and I have gone over all the connections and everything seems fine.

We have reset the computer by draining the power overnight.
I have tried using the second PCC to lock/unlock the security in the hope of unlocking the other one.

All of these have been to no avail – so, putting this out there, in the hope that others have had the same issues and found a solution, or anyone who may have a possible solution will all be appreciated.

Many thanks.