All depends on money really. If there's any chance you'll have enough cash for the 5D2 then you'd be better off getting that I'd think. Personally I wouldn't but the 40D is worth saving up for so would upgrade to that, if I wasn't saving up for something else
