The way number of collectors are being calculated in the code is dependent on the number of collector directories created in the data directory for each stream.
That will mean if those collectors which are decommissioned will be counted,this can lead to ever increasing number of collectors hence ever decreasing number of files for local stream.
So i would still suggest to go for num of files per collector which would only make thing better from the current state where there is no throttling at all.