Stop in for a cup of coffee

Replace the entire, what you call pigtail. Tie it into good wiring like they did when built...use bell connectors. ImoView attachment 1716272351
If it was me I would simply rewire that first bit. Not very complex and easy to get to. Then you know it is solid.
Think I'll do that and see how that works. Thanks guys it's cheaper than replacing the whole harness.