Taking the suggestions from this thread, I've worked up a new track plan and welcome further feedback. The lower left spur can be used for future expansion, the top right can be an interchange. I'm considering a small tunnel on the outer passing track at the right. Let me know what you think.
