Mostly we just need to widen the track. On30 requires 3" centers in order to pass safely. First thing we'll do is work on the curves.
Here you can see the 3" measuring sticks that I added to gauge the separation.
Here is the layout now. Ready for cookie cutter.