Here is a draft of my track plan

 

Click on the picture to see large size

 

My new plan