When does the combat "click? (WOTR)

Just defended the inn, about six hours or so in. I'm enjoying the build-crafting and reasonably invested in the story, but combat is starting to feel a little samey to me.

Does the encounter design get more varied as things go, or it mostly just X number of enemies with Y resistances coming straight at you? I know I'll get more controllery spells later, which will help, but I'm starting to worry that the core of combat is just "make numbers bigger" moreso than "find cool synergies/use your abilities in interesting ways/take advantage of the environment."

I'm aware that there are a lot of ways (and a lot of complexity) to make those numbers bigger and that that's part of the fun, but I'm just sort of hoping that's not the main thing, you know?