The OP is stuck at a complicated point in the camera cycle IMO
The 5D2 is well and truly about to be replaced soon, no ifs or buts about it - I mean, I did play with the pre release models way back in mid 2008! My advice is to just use your existing camera and wait out for the 5D3 which is inevitable, or find a 2nd hand 5D2 for a good price, I dont see the rationality in buying a new one unless
Canon is offering a cash back or clearance sale at the end of its life cycle.
Judging from your
lens list, you have no
lenses which will be able to fully utilize and resolve the high MP sensor of the 5D3 when it comes out, it will be higher than the current 21mp - thats a given.