Gapping both rails and using terminal tracks sounds like a good way to simplifying the wiring. But if you gap both rails, you will have to use both the wires that come off the terminal track and connect them to a DPST (Double Pole Single Throw) switch, also available at Radio Shack. Then you would run two more wires to your DCC command unit. If you find that a short occurs when your locomotive crosses the gaps going onto a siding, just reverse the plug in that sidings terminal track.