I hope so, I just spent the last 5 hours collecting about 270 hero points from Path of Fire and Heart of Thorns expansions, I now have 305 points saved up. There is only 1 more hero point challenge in Heart of Thorn expansion, but I am far away from getting the itzel poison mastery that is needed to reach that one. I got all the ones in Path of Fire. I think the only points I do not have are ~90 points scattered in the original game, but you only earn those 1 point at a time, that's to much a grind. So yeah, hopefully I am prepared for the next specialization right out the gate.