Yesterday, Two trusted and talented mates with more knowledge than I will ever have began the swap with me.
At the end of the day the Motor is in the frame, after the usual nightmare of frame wiggling & finger pinching issues, followed by creative cursing.
The spline on the output shaft (2015 motor) previously thought to be a concern, was exactly the same as the 2007 motor so drive shaft was an easy fit.
The oil tank was a massive issue. oil feed lines were different diameter. Larger on the newer engine, have to get a couple sleeves machined up to fit 2007 oil tank or buy a later model tank. Not sure if the internal pick up / returns are different at this stage.
Wiring is also going to be an issue as we have plugs & connectors to try and marry up correctly, which I don't think will be a quick job.
Will be a while before it is running, but it is closer than before.