Hey Jim,
That looks good! That curved switch ate up a lot of room in that narrow area there. I love the longer spur and how you reconfigured the wye portion. I'm in the process of planning a new layout similar in size to yours actually and this is some great inspiration. Hope it works out for you and that all your engines no longer have any issues.
- Victor