Factory terminals to re-pin connectors?

You are right about the factory connector not locking into position. I have dilled the holes out and just stuck the pins through them. The Molex sockets will give the same retention force the factory sockets had. 3D printing a connector is an incredible idea. That's a good way to solve the problem of dealing with these obsolete and impossible to find connectors.