Assembly hole callout in part drawing

SW 2018 SP 5.0

I have an assembly with an assembly-level hole-wizard feature containing 20 holes (thru all). The feature is propagated to the desired parts (i.e. sealing face, gasket, etc.) including some parts that are cut by only 5 of the 20 holes.

However, when detailing the drawings of the parts that are cur by only 5 of the 20 assembly-level holes, the hole callout reports 20 holes instead of 5. It looks like it is either pulling the <NUM_INST> value blindly from the top-level feature and not from the propagated feature or SW does not update the <NUM_INST> value at the propagated part and just lazily copies it from the top-level hole-wizard feature.

Is there any way to have SW correctly provide the number of holes in the part instead of the parent assembly? As of now, I have to manually delete the <NUM_INST> and add the correct number of holes by counting them.

Since the first response will probably telling me not to use the assembly-level hole wizard and put the holes in each of the parts, I do not want to use multiple part-level hole patterns because:

I was using part-level holes since the assembly-level cut extrude (and presumably assembly level hole wizard) no longer worked in SW 2016 (I would have to toggle "propagate feature to part" off and then on every time I opened the file and couldn't use it if I had more than one instance of a sheet-metal part in the assembly). But this involved going to each part and manually adding the hole-wizard feature and then making the points in the location sketch coincident with the points in the location sketch of the part that includes their dimensioned locations. I was having trouble getting the hole locations to automatically update in each part without editing the relevant sketch in each part. It looks like the assembly-level hole wizard for the most part works again.
From a philosophical point of view, bolt holes in custom flanges are necessarily assembly-level features that are propagated to the parts
Other features drive the mating of the parts, so I would be overdefining the assy with mates to the holes as well or I would have to dimension the hole locations relative to the features that are used in locating the part in the assy.