I think you answered your own question. Disconnect BOTH wires at the alternator and try it again.
If that cures it, have the alternator rebuilt and TELL THEM YOU THINK IT HAS A LEAKY DIODE or TWO!

(They may not listen, but if you pay them twice, maybe they will fix it the second time.)