Pretty happy with this layout for the Rev 1 board, which will be the production PCB :

As mentioned previously, the J1 header is for the Recovery mode jumper - now spaced sufficiently to allow clearance with the ROM-Link header. CPLD code has been updated to suit the layout - I just need to test it with my handwired prototype, then should be good to go.