Just an update on my wire harness issue. I purchased the entire harness from the dealership and installed it over the weekend. Seems like the best method is to drop the front driveshaft like 07JeepXK suggested, I don't think that it can be done with the front driveshaft in place. The connections in the engine bay were a piece of cake, I removed the battery to have more room to work. So far the Jeep fires up every time, with no issues. Even with the front driveshaft out of the way, it's still very difficult to access the starter connections, definitely not a job for someone with a short fuse. Here are some pictures from the job. Thank you for the advise guys!

Click image for larger version. 

Name:	IMAG1483.jpg 
Views:	265 
Size:	94.5 KB 
ID:	2256Click image for larger version. 

Name:	IMAG1492.jpg 
Views:	272 
Size:	94.2 KB 
ID:	2257Click image for larger version. 

Name:	IMAG1493.jpg 
Views:	260 
Size:	94.2 KB 
ID:	2258

JF