Quick update. Haven't done a whole lot lately as I've been busy with work and my other vices.
The M40 and all automatic related bits are now gone. Also had some pretty bad rust at the base of the A pillars that I wanted to get sorted before progressing any further so got that and the bumpers colour matched at the same time. So stoked with the result.
Before:
After: