D&D 5E Does Wild Shape Ever Get More Than Two Uses?

[MarkB]

IME moon druids can already handle being front line even with limited uses since it lasts for an hour or longer each use.

The duration is good, but it isn't always useful because of the limitations of what you can do while wildshaped - especially communicate. Technically, barring telepathy or the like, the druid can't actually say anything to the party, or to anyone they encounter, without reverting to their normal form - which can be tough if they want to have input while exploring along the way to the next combat.

However, if you wanted to do something like this I would require maybe two spell slots equal to the CR of the creature you are changing into, minimum two 1st level slots for CR 1 or lower. You could try it out to see if it works or is too restrictive.

That sounds like a good solution.