After the wife told me that the room I had in mind for the layout was to be used as the nursery next time round, I knew I had no alternative but to find a different room. The only other room is a different size and as a result I will have to reduce the layout to an L shape, and the other way round. In some respects this does me a favour by creating straight platforms which will be easier to make. Heres the revised layout, prior to being flipped the other way round.
And I have also had a go at redoing the wiring diagram this time using common supply and return wires, DCC style to try and reduce the number of cross board wire connections. I would be grateful for any views particularly on the wiring, although I thinks its correct I'm not a 100% sure.