It’s definitely the finishing straight now, barring some horrific problem. First up is that I finished re-installing the transmission. As a consequence of careful design and planning, cough, it all fitted fine and will hopefully work OK.
Luckily, the gearchange lever on the ’08 engine is in almost exactly the same position as on the ’07 engine so no change was necessary here. You can see my super-long gearchange cable snaking around the engine in the photo here.