1/2 way there. Got the starter out and I'm in the middle of replacing the contacts & plunger/contact ring. The old ones were worn to the bone -- it's a wonder it would even catch at all. What a pain in the a$$. They tuck the starter under the back of the intake manifold so have to strip off 1/2 the topend of the motor just to get to it. Turns out the job is pretty well documented on numerous 4x4 forums and seems to be a systemic problem with nearly all Toyota/Nissan gear reduction starter solenoids. So far I'm into the job for $46, coulda cut that in 1/2 ordering parts on-line instead of the dealer, but the local boys have families to feed too.
On the upside, it will go alot faster next time if we keep it long enough, just turned 100k & haven't had to do but routine oil & filter changes -- knock on wood!!!