Yeah, I would change the orcs part of Nightstone as well. I like the idea of the elves showing up to help against the orcs, then reluctantly asking for help against orcs in the forest. You could make those orcs hobgoblins, or make the HotH hobs into orcs.
The worry for me with old dungeons...