Been a long time but did you manage to sort everything out?
I am currently fixing a broken electrical system on a 1980 280zx, I know the feeling
Sounds a little weird that you have all those things broken. Are you sure all your fusable links are good? Even if they look fine they can be broken inside, that happened to me.
How do you measure "pulls a short"?
The paper version of the FSM has a nice schematic of everything.