Agreed on everything, except that (1) I think you're being too generous to refer to the survey as using definitions, (2) I am certain that the 5% who don't believe in God are a more accurate count of atheists, and (3) you would have to shove razor blades under my fingernails before I called myself Wiccan.

To the extent that there's anything to be gleaned from such a survey, I think the remarkably high number of people across all religions who believe in God as an impersonal force is the most interesting, and the large number of people who do not believe their religion holds a monopoly on entrance to paradise is also pretty nice to know.