and i quote "houdini didn't do magic, he did escapes" (<--- i have no idea if thats the exact wording but i wanted to say "and i quote" and i see the irony of putting that in quotes as well)
i would say though that houdini wasn't a magician per say or at least thats not what he was famous for. The best magician in my opinion would be generational. In the past 100 years, probably The Professor, although its a tight race, in the last 10 years id probably go with Ammar or Homer Liwag. Both have a diverse repertoire and create magic out of everyday situations with everyday objects. I would also like to mention Danny for creating some amazing pieces of magic in the last decade and being one of the most entertaining guys to be around let alone see perform and Houchin for his creations and great performances. I just think Garcia and Houchin's creations overshadow their performances as magicians. Although with wayne... its pretty close.
edit- first, if your trying to use a metaphor for an escape artist and magician, wouldn't go with Criss Angel, that implies he's a magician. Second, comparing Erik Weisz to Criss Angel is an Abhorrent mis-step.