this is my first post, so Hello all and thank you in advance for any help.
i'm pretty much a complete noob as far as rc boats are concerned, so any help would be appreciated in simple terms

i have a project which i'm researching and this looks like the place to get the answers. basically i have a pondskater orca bait boat
http://www.pondskater.nl/english/pondskater_english.htm which is in need of a compete overhaul electrically.
internally there is;
the motor which is: 755 - 7800 RPM unloaded, 9 W max. RF-suppressed
two servos which do the steering and also the bait release door. i cant see any info on them but one has three wires (white, red and black) which does the steering and the other (which does the bait drop door) has three wires (orange, red, brown)
there is a semi sealed box inside which contains the original radio gear which is a printed circuit board the manufacturers info on this is; Radio receiver: 1 stick, 3-channel, 27 or 40 Mhz (24 frequencies)
there is also something which i think is the speed controller between the circuit board and the motor.
now i would rather re-use the servos if possible as there are sort of moulded places for them to 'sit'
the motor if fine also.
but what i would like to do is replace the radio gear and speed controller with something better than whats there at present. (i have had problems with bad signal and overheating)
the battery that the unit runs off is a 6v 7ah sealed lead acid (alarm type)
i was looking into getting some yuasa 6v 12ah replacements, would these be ok? and also need another charger due to charge times.
there is also a three way water proof switch which controls whether the boat is 'on' or 'on with lights' as it has navigation lights around the hull. i presume this could be wired in a similar fashion to the new electrics?
lots of questions i know but i am very grateful for any help!

thanks
Lee