Wild Shape is the prominent feature of the Druid class, but it allows only two uses until level 20, when Archdruid makes it limitless. This scaling feels quite odd to me and it appears to impact Moon Druids the most, since they rely on it for their combat prowess, while Land Druids have their superior spellcasting abilities. I'm aware that it can be maintained for an amount of hours equal to half the druid's level and that the two uses are regained after a short or long rest, but the scaling of 2 uses between levels 1-19, then infinite at 20 feels weird and underwhelming, especially between levels 8 (when the feature gets the last power-up) and 20.
Is my concern sound? As a DM, I thought about increasing the uses by 1 at level 12 and 16 (total of 4). Would this make the Druid overpowered, outshining his party members (a Bard, a Barbarian and a Paladin) too much, either in fight or in utility contexts?
Note: the environment is pure core books.