I just picked up a used Simrad TP22 on ebay for about $200, had a cut wire but that's not too much of a problem to refit. I won't be fitting it to a chartplotter/NMEA system so I just need the power lines. Not going to help with your Whitlock, though.
When you couple an autopilot to a self steering rig, are you driving the tiller with a simple windvane, or the servo pendulum or trimtab? Can it be done with either? I imagine the pendulum would would work better with light winds. If you're motoring, would the apparent wind on the vane be enough to move the rudder and save some amp-hours?