I like both of these storylines, particularly he first one. That one matches what we have discussed earlier, so I guess there could be a consensus. I like the second as well, but I'm not sure I think Amros should act that way. I can't really see why he would.About Dwarves, I have suggestions for two different storylines:
1. Finrod comes to Thingol telling him about his dreams from Ulmo, and his desire for an underground fortress similar to Menegroth.
2. Thingol talks to the Dwarves about it. Having heard that Finrod is rich, they suggest that they'll sell Nargothrond/Nulukkizdin to him.
3. Thingol tells Finrod and introduces him to the Dwarves. He is eager to make friends and willing to pay them handsomely. They lie, telling him Nulukkizdin was one of their old halls that they don't need anymore.
4. The Dwarves go to Nulukkizdin -- which is inhabited by Petty Dwarves -- and drive out the natives.
5. Finrod and his people are welcomd into Nulukkizdin and start modifying and enlarging it. Finrod has no idea it was stolen.
6. The Petty-Dwarves are really hacked off about this. They end up at Amon Rudh.
1. Caranthir encounters the Dwarves of the Blue Mountains. He initially does or says something very rude and they do not make friends with him.
2. The Dwarves start trading with Celegorm and Curufin. Celebrimbor makes friends, and both he and Curufin start learning some Khuzdul.
3. Amros, living on Amon Ereb, decides to mess with his brothers. He forbids the Dwarves to pass through the land he has claimed. He assumes they'll just stop trading with his brothers.
4. Instead, the Dwarves shorten their road and move it slightly north, into Thargelion, and take up trade with Caranthir.
5. Caranthir gets fabulously rich. Amros is not amused.