[MagicRat]

As for the stalling, it might be insufficient fuel pressure and/or fuel flow. Try changing the fuel filter. If the problem persists, consider getting the fuel pressure measured. The pump may be bad, a fuel line may be pinched or the pressure regulator is bad.

The electrical problem may be trickier.
Try removing all the fuses,then unbolt the positive terminal from the battery. Use a 12 volt test light to connect the pos battery terminal and the pos cable. If the tester lights up, there is still a short on the system. Try disconnecting the starter motor cable, starter solinoid and other curcuits until the light goes out.

If the light does not illuminate, try putting in the fuses, one at a time until it lights up. That should tell you which circuit is producing the electrical draw.