Would Mitt Romney be a tougher candidate than John McCain against Obama?

Considering McCain's pathetic speaking skills and zombie look, and he can't raise money, would Mitt Romney have been a better opponent? He is semi-charismatic, has money, and is a good speaker.