Your reference to Scrivener caught my eye. I’ve always been an editor nerd. Back in school, people would call my attention to good editors they had seen, as it was known that I was always looking for my next favorite editor. My wife showed me Scrivener a few years ago, and I love it! Anyway, good luck and have a great day!