Fix the limit you keep encountering
If builds rarely come together, consider more choices or action uses. If a build needs more moves, inspect the fourth slot; if support or backpack space is the problem, inspect those capacities.
Affinity improves odds, not certainty
Lab affinity makes starred favourite moves appear more often. It changes their weighting, not a guarantee that every upgrade selection will offer one.