But the problem I encounter right now is the agents sometimes will be dead locked within choke points.

I got a similar problem once (lot of agents and narrow tunnels). It depends a lot on the environment you have. There are several solution additional to coop-pathfinding or queue, but it depends on the environment and the agent movement possiblities:

1. swapping: you can swap entities, if the block each other (works in grid/rogue like scenarios)

2. always move right: entities will try to follow a path by moving on the right side of the path (path following steering behavior)

3. queuing helps a lot to ease a situation, but alone will only help if your entities are not blocked by other entities moving in the opposite direction.

To be honest, I wasn't able to solve this situtation in a satisfying way, therefor I disabled entity/entity collision at all (only entity/player) and added steering behavior (queueing,avoidance etc.) to give a better illusion of collision less entity movement.