Well, you are in luck because there are still a ton of BoE's to be added. Along with stuff from Vendors and Quests. Usually each build averages around 1-2k items added (will get lower as we get closer to putting them all in). After that you can start work on another armor set
Try turning off and on completionist mode. It's an issue with Blizzard being buggy, however, Crieve is setting it up so each new build it does a force refresh of your collection so it should help in it being a bit more accurate and accounting for any bugs Blizzard might have with their item system.