^ a solid plan. I'd re-pin the harness to a new connector but be aware that this will grief anyone if they have to work on it or replace something later. There's every chance that particular OEM socket is available somewhere but you may have to buy it in bulk...
Bookmarks