China Basin switching Layout

Been trying to figure out a switching layout plan which captures China Basin, yet fits in my available layout space.  Here is my latest attempt: