I've stopped using FSM for Behaviour Trees instead. Though not related to the problems here, it just makes it easier to design and reason about. Not to mention more decoupled and thus reusable.