Much better. You now have a layout with some operational potential as well as continuous running. You've also saved a couple of hundred dollars on unneeded switches.
I'd look at the way the roundhouse track is set up to come off the main line. Right now, you can only enter or exit the roundhouse tracks from the outer main and you have to us two crossovers. You really only need one track. That can connect to the inner main and then you can use a crossover switch further down (or up) to connect the inner and outer main. You need a crossover somewhere between the two mains anyway and this solves two problems at once.
I'd look at the way the roundhouse track is set up to come off the main line. Right now, you can only enter or exit the roundhouse tracks from the outer main and you have to us two crossovers. You really only need one track. That can connect to the inner main and then you can use a crossover switch further down (or up) to connect the inner and outer main. You need a crossover somewhere between the two mains anyway and this solves two problems at once.