Patrick, given what you report re the reverse-polarity situation, I agree that the diode is the likely cause of the short. A straightforward diagnosis can confirm this.

[...trimmed text...]

If you choose to modify/repa... Login to read more.