Great points Luis!
On a positive note, I'm pretty sure I just got myself a 5D Mark II
Now I need to think about lenses..
The 24-105mm will be standard walkaround, but I want a wide angle for night sky shots and general widefield landscapes. It might not be the same lens..
The 17-40 or 16-35 are my current choices, but one is half the price, but slower