Did Maedhros kill Laughter?

[Oddwen]

So...if we're changing indiscriminate parts of the Silmarillion to keep Lalaith alive, I want to introduce a character to Maedhros who can possibly persuade him to give up violence forever.

I've put a lot of thought into this. After a battle this elf-princess of no particular kingdom would come across him while he is wounded, and nurse him back to health, impressing him with her gentle and peacelike ways. She would be tall and womanly, with long blonde hair and piercing green eyes. She is very accomplished in singing, dancing, fainting, cooking, magick, healing, and killing only when absolutely needed.

The only flaw in her is that she looks exactly like me. Not that there's anything wrong with me, I thought I would give her some realism
so this serious character is not confused with a common Mary-Sue.