Generate kext on Windows and stay with xhci patch enable. Don't need remap, just generate!
https://olarila.com/topic/37827-hackintosh-remap-usb-with-usbtoolbox-windows-or-macos/
If u have catalina generate ssdt for power management there and use in new system. Much better.
https://olarila.com/topic/6451-guide-generate-ssdt-for-power-management-with-ssdtprgen/