> if you're patient and methodical, it's not terribly hard to win most fights, scratch-free

I was pretty satisfied with how they addressed that issue in Enemy Within. There are optional objectives that give you bonus resources if you reach them before they expire after a number of turns.

But yes, in Enemy Unknown, I gave up on my Classic runthrough after I realized that I could win easily if I just advanced slowly enough.