That looks pretty good to me Dave, I think you've got it! Really looks close to the original plan too. Glad you got it all worked out and fit together so nicely. I like your idea for the added turnout also, I think that would be a good addition to the plan.
For some reason, with Atlas track, I have always had better luck fitting the O-54 stuff together. Every time I have tried the O-72 and larger stuff I got in trouble fitting it all together, ended up frustrated and gave up. The O-63 with no switches can be troublesome as well, but that too works better with O-54 stuff, for me anyway.