The fix looks good to me.

This update fixes the problem for me. I can now boot into Windows the first boot and then reboot back into Windows the second boot. The third boot I can manually switch back to my Linux entry and then reboot back into Linux automatically on the fourth boot. It also works correctly with the next_entry feature.

Appears to be working as expected with the fix applied.

Fixes the boot delay issues.