How I would do Beastmaster:

Do you have a mount? The mount is now a Companion with a tech tree of abilities (like Chocobo, but only one role). Companions are now usable in dungeons and normal trials. Have fun.