For the level problem: no idea.
As for the non-combatant problem: I assume you've tried different henchman behaviours (follow, stand ground etc.)? Beyond that I'm once again at a loss for suggestions.
(This reply is really just a shameless plug for my own related question below, see my 'henchman behaviour bug?'- thread)
Carrie