I would lean towards starting all over again with a new tile system. I suspect your main is undersized, and not in the best of shape.
Be sure to have a qualified person plan your system. Good planning can make a difference between a good system and a great system.
good luck with whatever you do, gordon