For example, I adjusted the position of the curved switch E1. I also decided to curve the track originally designed as straight for the freight station:
Significant progress on everything else:
I had some troubles with the yard tracks and ultimately decided to solder the rail joiners and only keep the flexibility with the isolated joiners at the switches.