Ready to buy 20D. Please critique my list!

So, I think I have FINALLY decided on what I'm going to get.

Keep in mind, I am coming from a PowerShot G2. I am a DSLR novice. And I have a limited budget at this time.

Here's what I'm planning to buy:

Canon EOS-20D (body only)
Sigma 18-125mm f/3.5-5.6 DC
Sandisk 1GB Ultra II Compact Flash Card (x2)
Canon Gadget Bag Deluxe 100 EG

Total: $1977.90 (not including possible taxes and S&H)

Now, my plan was to buy through B&H, but should I go local and buy from Wolfcamera? Can I get better warranty options from the latter?

--
Canon Says You Can!