My wiring works, but I would like to rewire it, I have no idea how (having said that I'll check my manual) depending on days that you work on your car I might be interested in helping if you needed just to get a more hands on feel for a ground up rebuild, but it looks like your advancing through everything pretty quickly. Did you pull your discs from a wrecking yard? or did you purchase a kit? Depending on my rear end stability (makes a weird rolling sound even though I keep checking the gear oil) my next upgrade/replacement would be my brakes.
Sadly I had been doing a full piece by piece mechanical fix on the car before the transmission went out on me five years ago causing her to go into storage. Now she's back on the road but time was my enemy and five years of sitting basically undid everything I was trying to do.