if it were me id go 1dmk2N £2300 compared to £1900 for the 5d i think the better and faster af weather sealing and 8fps drive would give me more 'keepers' irrespective of the slight quality increase of the 5d. but then i'd want to use it for sports as a large part of my shooting.
back on topic, we'll hang on for the digicams arrival shiato. could always shoot on film of course tho