Looks like fun Dave, and will be a right stunner to your standards!!
If it were me I'd probably move the left point to the container terminal right back to after the right point to the shed, and either do away with the headshunt or use it as a pilot parking spot, then use the main loop back to the sidings as a headshunt to make up container trains from the two terminal roads...