Hello Swav,
The plan looks very good
To fix the problem where track ends are close, but not joining, you need to increase the default connection tolerance in the settings. Go to "Tools" > "Settings" > "Edit" > "Tolerances" and increase the "Distance" to 0.15" or even 0.2" - this is OK for O-gauge as default tolerance is intended to be used with the smaller scales such as HO and N.
Mixy