Just an idea, and I don't know what switches you would need, but that switch on the lift out bothers me. What about moving the switch to complete the wye past the door- you have 18' there, right? Could be a hinged lift maybe.
This is assuming you don't want to relocate either the siding or the existing track on the existing layout. I don't know how finished it is. That would be the simplest option.