Not overly knowledgable on this but I think the manual choi upgrade on the switch.homebrew.guide site should help you out (can't link as am a newbie on here).
Essentially fully rebuilding the NAND with your BIS keys. You can then boot into CFW with hekate - skipping fuse check, and update to...