What brand of track and switches are you using? If you're using pure AF tracks and switches then you're ladder (switch yard?) won't work correctly. I tried replicating your original layout with RR_Track and the switch base causes a problem coming off the main. The switch base touches an adjoining track. I put in a 3 inch extension and the switch base doesn't touch the main.
Steve