Much improved in my view. Here's what I'd be asking myself:
1) Do I really need that kickback and engine shed? Does it add operations value to the layout? Without the kickback, points for sidings could be moved to the right, and the siding through the goods shed could be longer. It would also put more siding within easy reach.
2) Why not extend the siding through the goods shed and stub end it at the station building, like the prototype?
Mike