Giyu survives in the manga. The plot doesn't lead to his death. His character has many adventures and developments that keep him alive and active in the story.
In the comics, Daredevil's marital status varies. But one notable character he marries is Elektra Natchios. However, the comic universe is complex, and there might be alternate story arcs with different spouses.
Thor's marital partner in the comics is not always consistent. Sometimes it's Jane Foster, and in other cases, it could be someone else. It really depends on the creative direction of the particular comic series.