Okey, i looked at it, and i have kind of the same problem, but not exact.
Making it one way sould stop most of the problems. Thats great if you have double track, but not, that dont realy work.
Also, the signaling is quite comfusing. How do i know i what direction it makes it one way?