I think the game should remove wild shape charges entirely from the Moon Druid. Just give them the ability to wild shape at will as an action, that's it.
That's broken. Permament Owlbear, no cooldown, no limits? That's a level 20 feature.
You want a character that basically has got infinite health. TERRIBLE IDEA.