Nice plan!
1. Personally I would simplify the track in the closet. It looks tight, and as mentioned, the curves make coupling and re-railing more challenging. Plus it is N-Scale (I.E. small) which adds to the challenge. How is the light in there, and how is your eyesight?
2. Be careful of...