5D or not 2B
You will be thrilled with the 5D! I went from a 20D and could not get over the difference. The noise difference alone will just amaze you. I just got a 1D III last week. I haven't had much time to play yet but I am not sure I will ever love a camera as much as I love my 5D. By waiting for the price to be lowered more (which may or may not happen), you are losing time with this incredible camera. If you aren't worried about the new version, go for it!