Having the same issue with my dog I found Agility class did not help. I took a step back and I have been working on focus to the exclusion of all else.
IOW"s you need focus to do agility, not doing agility to get focus.
IOW"s you need focus to do agility, not doing agility to get focus.