Yeah, I know what you mean, there's a lot of that kind of business later on, plus it gets all hack and slash on your arse.
Yeah it really devolved into a lot of hack and slash. Which wasn't so bad except that it seemed like villains were respawning all the time, which made figuring out the puzzles a bit harder as it was a pain to try and backtrack if you had to.
Ultimately I liked the game - I plan on giving it another few run throughs with different characters later - but I think the end isn't as strong as the begining.