For trolls, use Fensirs from the Fiend Folio.
For goblins, use the Spriggan from the Fiend Folio.
Both of these humanoids have really interesting and unexpected abilities!
---------------------
Also, if your interested, check out my take on D&D humanoids in my blog.
And if you want a slightly...