@ Pike: Are you just having the wall-hitting problem in narrow places? Because in that case, the problem could simply be that you try to use horizonal attacks too much in those places. In really narrow places, almost all horizonal attacks will end up hitting the wall, so try vertical attacks instead.
As long as you're locked on to an enemy, I can't think of another reason for things to go wrong since you usually can't even turn away from an enemy that you are locked on to.
Experiment with the different kinds of attacks (light/heavy and after rolls etc) to see what works best.