5D Mk II is an easier upgrade for you, if you didn't want to buy a new lense to cover the ultra-wide angle. Anyway, if 5D worked for you, 5D Mk II would be a good fit. If you find something lacking in 5D, 7D is probably better for you and more of a new toy for you to play :)