I went through this when deciding where to go from my 300D (First Digi-Rebel). From the reading I did, the 40D picture quality is on par or exceeds the 5D in most situations.
If you choose 5D route, then definitely wait for the upgrade. There's no clue when it will come unfortunately, but you can have the 40D now.
