I get that you already have the BB7s and maybe you've used them and you're adept at setting them up and fine with their performance. But, there's a new set of Spyres with 160mm rotors for sale in the forum now for $105. Here's a set of Hy/Rd at a great price ending soon.
https://www.ebay.com/itm/232489845679
You can always sell the Avids.
You might want to search around to see what calipers are known to play the best with the levees you're using as some combos are better than others. Good luck!