This is probably not what you want to hear, but I'd keep the 40D and use the difference to replace that kit lens! I
love the 5d, but unless you need the marginally better high ISO performance and/or are willing to make a major change in your glass, I wouldn't switch. But that's what I would do