OK, I got much respect for you Merric... but YOU'RE THE DM, it's your game, not the adventure writer's game, YOU DECIDE ON THE MAP AND THE ENCOUNTERS. You're experienced enough.
Don't let WotC always tell you what to do!
If things are getting too repetitive and there are too many combats...