I changed the obstacle avoidance to repel from the lines defining the obstacle. Not perfect, but a good step forward.