I wonder though if the argument should be framed, "America was a nation of Christian citizens who founded a non-Christian government. That separation was their genius."

Now, I don't believe that Christians today use the name the same way that Christians back did then. (I think they were more theist than evangelist, so they would have been just as uncomfortable around modern Christians as some atheists are.)