I'll toss in a vote for Sermos connectors, also known as Anderson Power Poles. I don't think it really matters which of these three types mentioned you wind up getting; that depends on your budget, skill with a soldering iron, or what's available at your local shop. But replace the Tamiyas with SOMETHING ELSE. They were not meant for the sort of use/abuse that we (RC'ers) put connectors through. They WILL fail after repeated use, and in a way almost certain to cause a crash.

Steve