How did I miss this?

? I'm a little slow Dan. If you want to clean up the door connectors I can help you. Delphi makes the weather pack connectors that are normally in vehicles and that's what I would use. I have some crappy molex connectors because I am to lazy to change them out on my doors (I put power windows and locks in my TJ). I have one to disconnect my bumper wiring. I'll snap a pic.
This place sells them but I can get them cheaper some where else but need to order them piece by piece.
http://www.whiteproducts.com/metri-pack.shtml
Just let me know how many wires go into each door and I can order the connectors for you. I need to order a 4 wire connector for my lights that was crushed when my bumper folded in anyway. They are clean and neat. There is a clip to mount the connector that stays in the Jeep so it doesn't hang down when not connected. It also makes it easy to plug the door side connector back in. I also have some braided sleeving you can have to make the wires more presentable.
might be $10 to $20 bucks a connector depending on how many wires there are.