I think you are correct. Replace the harness with OE if you can get it.

And those are not AM battery terminals. As long as I have used them, I call them emergency use terminals.

As far as fabricating a harness or cables, I have all I need for that. But it ... Login to read more.