There are several issues logged about handling branches and moves better. One of the things that may be a way around this is to make it so the indexing threads can index changes past the large branch (assuming they are not in that branch).

We have some projects that do a lot of branching and it can take up over 8 hours for that branch scan to be completed. Meanwhile there are other changes going on in other branches that devs need to see in order to make a post commit code review. The face that they have to wait over 8 hours for a commit to show up can severely affect their productivity.