Suggestions for a Beast Mastery build

This is my PvE Build.

16 Beastmastery (12+3+1)
5 Expertise (4+1)
8 Wilderness Survival (7+1)
10 Marksmanship (9+1)

Skills:

Ferocious Strike {e}
Feral lunge (can be switched for disrupting lunge if you're fussed)
Predator's Pounce
Call of Haste
Troll Unguent
Comfort Animal
Charm Animal
Rebirth (This is optional for a R/Mo but it can be switched for anything)

Do you suggest anything to make it better? And if I was to go PvP with this character, what skills would be effective?

I would get Call Of Protection instead of Call Of Haste, I find that the better call for animals.

You're a monk? Use your secondary for some added beef. Don't worry about your bow and the like...

12+1+3 Beast
8+1 Expertise
10 Smiting

I'd ditch troll Unguent and Call of Haste for Call of Protection and Scavenger's Strike [if you want more damage, ditch Feral Lunge for Balthasar's Aura]

Now you're dealing 200 AoE armor ignoring damage every 10s. ON TOP of a nearly unkillable pet.