I've moved to Joplin and am pretty happy with it. Was easy to self host on my WebDAV.

I believe it imports Evernote data too.