How to Repair a Couple of Wiring Harness Problems

Today I started pulling my dash apart so that I can paint it and put on the new dash pad. I tried to inspect the wiring harness very carefully as I pulled everything apart. The guy doing my body work pulled the dash out with the harness still attached to most of the important stuff. Most of the wires and connections look pretty good, including at the fuse panel. However, I discovered two problems that I am wondering how best to fix. The first picture shows where one of the connections is busted on the bulkhead connector. Can this be repaired or should I try to find a replacement bulkhead connector. The wire going into this terminal is a fairly large red wire (I think). If I go the new bulkhead connector route, is it pretty easy to install all the new pin connections?

http://s1364.photobucket.com/user/W...7-4E2A-BF8F-3960010500E4_zpsudahz1kf.jpg.html

The other problem was this three point connector. I am not sure what it goes to because it was disconnected and hanging free from the dash, but it obviously got hot at some point. Are there replacement connectors of this type so I can fix this?

http://s1364.photobucket.com/user/W...F-41AE-B4C7-473298D78491_zpsyfqevscv.jpg.html

http://s1364.photobucket.com/user/W...E-4D29-83D6-2C08093198DF_zpsdlh5d46r.jpg.html

http://s1364.photobucket.com/user/W...7-4EB1-8072-D6F00CE6B127_zpsgku6xeci.jpg.html

I am keeping the factory harness because it is all in good shape aside from these two problems. Also, does anyone have any advice on how best to clean the terminals and connections for the switches (wiper, headlight, flasher)? Any thoughts would be greatly appreciated. Thanks.