It seems to me the elephant in the room is the buildings, nice as they are.
Try, difficult I know, to forget the buildings and design the layout to some different parameters, such as what you really want to see.
I think you're having doubts about every stage of the layout and it could get a bit problematical.