Leandro, something else you might want to consider (in addition to the ground plane wiring and whatever else you decide to do), is a TMCC/Legacy Signal Booster distributed by gunrunnerjohn. They come as either a kit (requires soldering) or a completed product. Very easy to add into your current setup and greatly boosts the track signal. Just a thought.
Rod