Jeff, Chris, here we go with a crude update on the drawing. The first screenshot is roughly how the layout is build as of now.
Here is a crude version of what Chris' suggestion could be. If I replace the 042 LH switch with an 072 RH switch, it should work out.