Hello All,
I apologize if my feedback is tardy.
Looking at the original track plan, I would add a crossover between the Equipment Storage track and the Mainline.
This would open up further switching opportunities along with an additional siding for the mainline in the opposite direction.
Hope this helps.