Uh, exactly where are you up to in ShB? I seem to recall there was only one 'role-play' fight in ShB's main scenario (not including the Role quest fights which had you
playing as one of Ardbert's friends in an Echo scene
), which was the
second fight against Ran'jit in Ahm Araeng as Thancred and although it could be annoying was nothing too difficult
. I'd say you're still on SB's patch story which did have a few role play fights which again, were nothing too hard, you just needed to use the revelant abilities given to you effectively.
It's annoying, but it does improve.