I would stick with ATL. Lots more flights to AMS than other hubs including KLM and if needed AF to CDG. As for AMS that's more than enough time. AMS is one of the easiest and quickest airports to connect at. Since coming from the US no need to reclear security even.