At least the latter option usually comes up as a reasonable obstacle in moving towards some quest/plot/story goal. Ideally, either the combat should be tactically varied and fun enough that the repeated enemies aren't as onerous as you make it sound, or both options should be avoided.
I demand that a positive adjective be named after me!