Well, I have to go, but just in case it is, I think the Nauglamir should be made later, not now.
JRR Tolkien always intended the Necklace to be made for Thingol alone, and not Finrod, and that's how he always wrote the story of the Nauglamir. In the War of the Jewels there's a great story...