I think the solution is to change how the "natural" mobs are tracked. Just having a NATURAL spawn reason shouldn't be good enough. Instead, some other flag on "non-natural" mobs should be set, and only mobs without that flag should be counted.
For context:
#8283
For context:
#8283