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.