Depending on whether you're getting the CCTV lens with the Tamron, I'd rather go with the Canon because I trust them more.
I have a Canon EOS 5D and something happened to the shutter, sent it in and in a week, brand new camera, WITH A NEW 2 GB CHIP! I kept mine, before I sent it in. Gotta love warranties.