[Rhodes22-list] New boat questions

[The Rhodes 22 Email List]

Couple questions now that I've accumulated a few hours on the Rhodes.
1.   My rudder started 'groaning' the last 2-3 outings.   It feels solid and is down all the way.   It just groans  as I compensate for puffs.   I haven't noticed if there is a point of sail it makes more noise, since I don't need it much on a run.   I figured I'd inspect the pins when it is out of the water, and maybe add some wax or something this fall.   Any 'on the boat' bandaids?
2.   Out of curiosity, does anybody know if the factory electrical system charges the batteries when the master power switch is rotated to off for both?
3.   Next upgrade is a new motor.   My 30 year old Evinrude 4 is too shallow (20"?) and the prop is small.   It struggles against a wind at full throttle, and takes several long seconds to stop the boat when I spin it around after backing out of a dock.    If I step forward I can hear it cavitate.   I was looking at the Tohatsu sail master 6 hp, 25" extra long shaft, with generator.    I understand from sailnet that Tohatsu makes the Mecrury and Nissan small motors under license.     Does anybody have feedback or suggestions?   I need enough to handle Lake Erie on occasion.   Following Stan's teachings, and after being shown up by a Catalina 22 father / son crew, Tamiko and I managed to sail into dock nicely.   We were stuck  with a run and reach, so I couldn't just luff the sail but had to furl the main with enough momentum to make the final turn and keep from drifting down on my neighbor.   Of course it was the last of the evening breeze, so not that impressive.   But I feel like I'm learning to manage the additional 2500 pounds displacement.  I prepped for the maneuver by watching 'idiot boater' videos on youtube.    
Alex ColeS.V. Lark (2002)