Just an FYI on the wiper motor , if the armature on yours is ok, you can swap it into a 12v fj40 wiper motor. The rest of it's all the same.
I did that with my old bj40, had a fj40 wipermotor from a desert truck that probably hadn't ever been turned on. Ran like new again.
cheers,
ryan