I changed the location of the turntable and roundhouse, moving the whisker tracks as well. Also, I moved the coaling station, diesel fuel depot and water tower towards the exit, so the locomotives can refuel as they leave the roundhouse. I believe I could fit an access hatch, or maybe get a topside creeper. I posted the updated picture above.
Edit: Almost forgot, here's an updated file too: