Agreed. That's probably how I would do it too.
Though I would probably go with a Nature, Clockwork, Elemental subclass for the Beastmaster.
And make a Bow Barbarian viable. With Hunters Mark being a Rage. It's already nature themed.
Also, I would move Wild Shape away from the druid, and...