Thinkpad T430s sleep issue (OC 0.6.1, Catalina 10.15.6)

I have just migrated to OC/Catalina from Clover/Mojave. My hack was working just fine when I used Clover/Mojave, including sleeping.

I followed Dortania's vanilla guide to build my own OC folder. I took the DSDT.aml from my old Clover folder, which I patched manually by following this guide (using RehabMan/Laptop-DSDT-Patch repo).

Link to my EFI folder.

Specs and info:

• Thinkpad T430s
• CPU: Core i5-3320M.
• RAM: 8 GB.
• SSD: Crucial BX500 256 GB.
• USB dongle plugged in while sleeping: TPLink TL-WN725N, Logitech mouse receiver.
• Boot args: -v keepsyms=1 debug=0x100 alcid=28 -xcpm

What I have tried so far:

• Dortania's "Fixing Sleep" guide (running pmset commands thingy, set hibernatemode=0.
• USB patching (EC renames, generate SSDT-EC-USBX.aml, SSDT-UIAC.aml, etc.).USBInjectAll.kext disabled.
• Power management patching (ssdtPRGen.sh).
• Rename the IOClass value from AppleUSBMergeNub to AppleUSBHostMergeProperties in USBPorts.kext (generated from Hackintool) as suggested from Dortania's mentioned fixing guide.

Symptoms:

• When I choose Sleep from the Apple menu, the screen goes off, the hard disk LED flashes a few time. Several seconds later, the HDD LED and the power LED remains on all the time. The system cannot be waken up since then. I have to force reboot the machine.
• Result of pmset -g assertions

​

2020-09-12 17:33:50 +0700 Assertion status system-wide: BackgroundTask 0 ApplePushServiceTask 0 UserIsActive 1 PreventUserIdleDisplaySleep 0 PreventSystemSleep 0 ExternalMedia 0 PreventUserIdleSystemSleep 0 NetworkClientActive 0 Listed by owning process: pid 114(hidd): [0x000000370009804f] 00:00:00 UserIsActive named: "com.apple.iohideventsystem.queue.tickle serviceID:100000349 name:IOHIDEventDriver product:Keyboard eventType:3" Timeout will fire in 900 secs Action=TimeoutActionRelease Kernel Assertions: 0x4=USB id=502 level=255 0x4=USB mod=1/1/70, 08:00 description=com.apple.usb.externaldevice.14100000 owner=USB Receiver id=503 level=255 0x4=USB mod=1/1/70, 08:00 description=com.apple.usb.externaldevice.1a120000 owner=802.11n NIC Idle sleep preventers: IODisplayWrangler 

• Result of pmset -g log|grep -e " Sleep " -e " Wake "

​

2020-09-11 23:53:31 +0700 Sleep Entering Sleep state due to 'Software Sleep pid=3449': Using AC (Charge:100%) 2020-09-11 23:57:17 +0700 Sleep Entering Sleep state due to 'Software Sleep pid=135': Using AC (Charge:100%) 2020-09-12 00:25:39 +0700 Sleep Entering DarkWake state due to 'Software Sleep pid=123': Using AC (Charge:100%) 2020-09-12 00:25:55 +0700 Sleep Entering Sleep state due to 'Software Sleep pid=123': Using AC (Charge:100%) 2020-09-12 15:58:41 +0700 Sleep Entering Sleep state due to 'Software Sleep pid=125': Using AC (Charge:100%) 2020-09-12 16:12:25 +0700 Sleep Entering DarkWake state due to 'Clamshell Sleep': Using AC (Charge:100%) 6 secs 2020-09-12 16:12:31 +0700 Wake DarkWake to FullWake from Invalid [CDNVA] : due to HID Activity Using AC (Charge:100%) 3 secs 2020-09-12 16:12:34 +0700 Sleep Entering DarkWake state due to 'Clamshell Sleep': Using AC (Charge:100%) 3 secs 2020-09-12 16:12:37 +0700 Wake DarkWake to FullWake from Invalid [CDNVA] : due to Lid Open Using AC (Charge:100%) 1 secs 2020-09-12 16:12:38 +0700 Sleep Entering DarkWake state due to 'Clamshell Sleep': Using AC (Charge:100%) 2020-09-12 16:12:52 +0700 Sleep Entering Sleep state due to 'Clamshell Sleep': Using AC (Charge:100%)