I've been using Joplin for note taking, but I stumbled across @NotionHQ  and I am quite surprised with the capabilities and ease of use.

I've moved some of my notes over and apart from embedded images everything has come across fine.