1/8 scale buggy conversion - help please!

I'd replace those 4mm connectors with at least 5.5mm connectors. The 4mms get HOT and loosen up pretty quickly. Many just egg their female connectors for a tighter fit, but my anal nature tells me that doing that just decreases the surface area of the connection.