Somewhat as a side note and the tight schedule mentioned above, I would not attempt to make it in CLT. Even with just carry on bags, it might take 2 hours there.

Having experienced the mess and long wait times in CLT, I flew Delta via ATL this trip. They have a new arrival hall in ATL and many, many kiosk's for people with a US passport. Total time from the time I got into the arrival area till I was to the baggage claim was less than 5 minutes. Way more efficient than what I have experienced in CLT.