I finished the aft fence baffle today, I used the cut-outs in the old one to give me a rough indication of where to put the new ones but positioned them more accurately this time. I'm happy with the gap I have now, it will be easy to fill this with RTV.