I hope you found a solution. I got in the same path and ended up with 17.0.0. My solution was to "turn on" the switch like of it was the 1.0 soft modded versión, you know USB-C cable + Android app called "NX loader for Switch". It boots directly to Hekate. I hope it works for you and others...