17-40 Vs 24-104 on a 1DMk2 ?

I am trying to adjust from a 20D to a 1DMk2, and need a good lens for landscapes and overall picture taking.
What would be your opinion on the 17-40 vs 24-105 with IS on the 1DMk2?
Going from the 20D is quite a change to begin with and the otions are boggling my mind to say the least.
I was going to pick up a magic Lantern guide, but from reading the reviews it would probably be a waste of time.
Any good sites for getting to know the 1DMk2 ?

Do you have the factory manual? Getting to know the two-hand control system on the early 1-series bodies definitely takes some time, but somehow becomes pretty intuitive after you get used to it.

The 17-40 makes a good landscape lens on a 1-series, although if you want range over wide angle the 24-105 isn't bad either. I have used both of them on my older 1Dc, and 1D3.

Here are some shots from my 17-40 on my 1D3:
http://www.pbase.com …hotography/imag​e/81179910
http://www.pbase.com …hotography/imag​e/81180038
http://www.pbase.com …otography/image​/122704700

And the 24-105 makes a nice walk around on a 1-series:
http://www.pbase.com …otography/image​/122704683

Both lenses are beautiful shots. I do have the manual, but its still a lot to take on, almost toooo many options