I went from 10.12.2 to Mojave directly, what used to work in Sierra wouldn't in Mojave so I had to start over.
What you're describing is, I think, is solved by the latest Lilu + Whatevergreen
give it a shot, duplicate your EFI folder so you have a working EFI just in case, and keep researching...