I reworked your original layout. Note that each switch as an 1 3/8" straight extension on the through leg as Carl mentioned. An additional 1 3/8" is added to the upper straight part of the loop to close the loop because of the extra length of the switch.
The layout is still less than 6' wide. You can lengthen it by adding straights.
Jan