That's why I like DnD 4ths new addition for puzzle encounters/skill challenges that are easier to build. You still get experience and loot, but from using your skills, not your swords.
And ya, if this was the first battle where you found your character to be overpowered, then it was the same...