Maybe make charm functional in limited areas, and make charmed NPC's immune to the effect? Would be nice to see bards, chanters, necros and mages get a lil more play!
Just spitballin, here....and not to sound a wiseass......but when dealing with something like this, with what I think Hunter has to do, the terms "as soon as I can" and "when its done" come to mind.