I realized my door pin bushings were wearing out. After looking at the price for new pins and bushings (along with the trouble to put new bushings in) and looking at the cost of new hinges, I decided to go with new hinges. New pins would have been about $10 per hinge and the complete hinges were $15 each for the uppers and $20 each for the lowers.
I got the passenger side done tonight. It really isn't as hard as it looks to be. Removing the door completely and marking where the old hinges where makes it super easy. I also replaced the factory bolts with new M8-1.25 x 35 bolts and washers.
I can tell you that after getting the door lined up and shutting good, the door shuts MUCH firmer and better IMO than it did before. It is a lot stiffer as well. I would say a lot of that has to do with the bushing behind the roller.
I will be doing the driver side either tomorrow or Sunday afternoon.