I've had the same dilemma and after alot of research decided I'll be going for the 60D. Mainly because I will be using it for photos rather than video and it has slightly better specs for that.
But as soon as I made my mind up the 7D peeked its head in so now I'm stuck between the 60D or 7D. The only reason the 7D has come into the picture is because the price on them has dropped quite significantly and is not far off the 60D price...so I'm still undecided at the moment
Suffice to say the 5D Mark 2 won't be coming to mind, mainly due the price but also it's too advanced for my skills for now