Starting fresh, seriously consider dead rail battery R/C. You may want to check out the Dead Rail forum.
From basic to full function features, your choice.
No wires, no polarity issues, no frog powering issues, TTs no issue, return loops no issue, no shorting issues, no issue with dirty rails.