Hi WaveZ

Yes, that's all good in terms of the wiring. By the way, Tamiya connectors are OK up to about 15A maxiumum. Other popular battery connectors for RC boats and cars are Deans and Traxxas, both good for 40Aor so. Beyond that most people use bullet connectors - 5.5mm, 6.5mm or 8.0mm which are good up to 150A or so but are more fiddly to use and more likely to get a short circuit because the terminals are not kept separate and the male bullet is exposed (uninsulated).

Also, what size is your prop shaft? - to check what kind of coupling you need.

- yellow-bird