I guess Morgoth must have revised his hit list pretty often... If we are to believe the Silmarillion, at one time Beren was supposed to be higher up than Fingon (and that was before he had teamed up with Luthien).

Is Cirdan speaking Quenya here? Independent-minded, isn't he?

Good to see your Cirdan again! Fish seems an appropriate nickname for him to have.

Now, which promise did he keep? I'm guessing it was the part about "looking after them" (except for it being a bit difficult to look after Olwe from where he was), rather than the "marrying", although he may not literally have done the latter.

They make a good team, your Cirdan and your Finrod!

And I really like the setting. You describe Barad Nimrais well and that's a nice vignette of the workmen.