Sump gaskets fitted (remember there's two of them because of the windage tray!) and the new sump bolts are fitted. All torqued up to 11Nm and some fresh oil has been poured in. No leaks so far!
I did slightly modify the windage tray to fit over the sump pickup as balancing it all and trying to get the tray, sump and gaskets to align to get the bolts through was a pain. It was merely a case of enlarging the cut out for the sump pickup; not a biggie.