Instead of downplaying the vanilla goblins, which are rather unique, why not devise a system that plays up their features?
Vanilla goblins are already hugely distinct:
No eating or drinking (saves on a big chunk of your time, but also means less ways to make them happy)
Can embark with tons of trolls (good for shearing as well as a cheap fodder unit)
Can have HFS or megabeast in leadership positions.
Multiracial society based off babysnatching -- some goblin civilizations wind up with equal amounts of humans, elves, dwarves, and goblins in it, others wind up with next to no goblins.
In vanilla, goblins can make a number of weapons that they themselves can't use -- like the two handed sword, only babysnatched humans are going to typically be able to use one of those. This leads me to think you could have a setup where the different babysnatched races can offer distinct advantages. Babysnatched types could offer really powerful advantages, to make up for how much work they'd be, including that they would, in fact, need food (despite that goblins know nothing about farming or food animals).
Remember, DF goblins aren't simpering little derp-beasts, they're lanky, fiendish creatures enslaved by demon overlords and enslaving all other races in turn. A goblin may very well have troll, elf, dwarf, and human minions. Incorporating babysnatched types and demons is a must.