I would assume they're warlocks for the "hexxer" part of troll culture. Obviously not quite the same - I just wish there was a glyph to allow demonic pets to have troll masks, like Fiznak. Though, I'm sure you know all this lore.
I completely disagree with the druid part, though. Everything in any troll culture points to them being druids, though not the exact same as the type taught by the Cenarion Circle. Animal Loa are Wild Gods, the same as Goldrinn, Aviana, Ursoc/Ursol, etc. We see trolls turn into animals (or animal-troll hybrids) through said Loa in Zul'Gurub, Zul'Aman, Zul'Drak, and Dinomancers on the Isle of Thunder/Isle of Giants. The Claws of Shirvallah talent was the troll equivalent to the worgen curse, which has been prevalent since Vanilla ZG, with Thekal and Arlokk - though all the Gurubashi and Amani priests had half-animal forms.
Considering we meet Gonk (who taught the Darkspear druidism through the Emerald Dream) in Zandalar (pic - NPC), it's safe to say that the Zandalari were the first ones to use druidism as trolls know it. No, it's not the exact same as Cenarius' teachings, but they would still be "druids" in WoW's rigid class names.