I have gone for a variation of the 2nd layout to keep the mains cabling relatively simple, and (hopefully) tidy.
I just need to think about the best way to extend the transformer secondary cables now.
Should be back up and running by the weekend.