In case of, I found that tool when I was searching for something just like efibootmgr (it might help too).

Have fun, you don't have to wait.