If you already have a 7D I'd go 5d2 - that way you can use crop or full frame to their strengths instead of making compromises (assuming the majority of your lenses are EF fit of course).
+1. You would be amazed how much better the 5DII is at high ISOs (and even base ISO). Also, the pictures straight out of the camera are much sharper. I own both the 7D and the 5D MKII.