Greetings experts,

I need your help here.

Normal Situaltion: I use Windows 10 and Kali dual boot on EFI system using GPT partitions. Both bootloaders are installed in EFS partition and kept separate (Windows isnt capable of detecting Kali linux and grub instructed not to probe other OSes.) System boots into Windows 10 by default, unless I select to boot into Kali from EFI boot menu (Pressing F9 on HP Omen laptop)
Partitions scheme is something like...
(Disk1) EFS - Windows 10 - Kali / - Other Windows Partitions
(Disk2) Kali /home - Other Commom NTFS partition

Current Situation: Whenever I boot into Kali, grub disables Windows bootloader and makes itself default and as I disabled any other OS in grub system boots into Kali everytime. If I mark Windows bootloader active and change boot order (using efibootmgr -a and -o option) next boot goes into Windows as a normal situation but if I boot into Kali again, grub does the same thing. I am confident enough to say this started after I updated Kali a 3-4 days back.

What I tried:
1. Removing all entries from EFI firmware and let it boot, laptop recovers/discovers Windows bootloader and boots (expected situation at least for my laptop model) then boot into Kali manually by selecting Kali boot file (\\EFI\Kali\grubx64.efi) and then manually adding Kali to EFI menu. Doesnt work.
2. Setting boot loaders prirority in EFI firmware as Windows first and Kali second, Doesnt work
3. Removing grub entry entirely from EFI list and boot into Kali by manually selecting its efi file, works but I would like to have "the" normal situation to avoid browsing for efi file (Also I do not want to install third party bootloader like rEFInd etc as far as possible)

Information you might need:
1. uname -a
Linux Kali 5.8.0-kali3-amd64 #1 SMP Debian 5.8.14-1kali1 (2020-10-13) x86_64 GNU/Linux
2. efibootmgr
BootCurrent: 0001
Timeout: 0 seconds
BootOrder: 0001,0002,9999,0000
Boot0000 Windows Boot Manager
Boot0001* Kali Linux
Boot0002* Solid State Disk
Boot9999* USB Drive (UEFI)
(As I am typing from Kali, grub has disabled Windows bootloader i.e. 0000, again and changed next boot entry)
3. Please let me know which info you need to solve this issue.

I would really apreciate if you can help me solve this frustrating problem, I was aware of Windows taking over grub on fresh install but this is really on another level :-D