Okay, I took the angled shims out from under the springs and it fixed the clearance problem... Didn't help the pinion angle any, but it works. Eveything is bolted down, again... Tonight I started rebuilding the hubs...
I just need to do a home alignment, finish the hubs and put them on, then figure out how to fix the stripped out brake caliper bolt!