We have the same plug in mind. Perhaps was unlucky; always use WD 40 or a silicon grease to seal though. Anyway, the solder seems to work.
My next project is a Vosper RTTL, am using the 2 x Turnigy 50A Escs we have been talking about. It has HK brushless motors and the limited trials have, so far, always been terminated because of either motor water leaks or the wire problem. Think may have resolved both issues.
My future project, which am still toying with, will be a modern 17m pilot boat. Will be around 28/30" long with a double chine hull, should be able to plane gently. The top speed should be around 25kn, much less that the 50 my Brave B or RTTL were capable of.
Would like to try Quicrun items in it. Find their catalogue a little confusing though, am thinking about 2 or 3s power, around 1500kv motors with ESCs to suite and the appropriate programming card. The props will be either 30 or 35mm, 3 blade. Is that something like your set-up?