OpenCore 0.6.9 EFI Update for anyone interested!
I've recently switched back to using Thunderbolt in ICM mode. While it's cool having a full Thunderbolt Extended Bus, I have found that sleep doesn't work correctly. However in ICM mode it does. All options are still available in the EFI. Simply disabled
SSDT-TB3-HackinDROM.aml and enabled
SSDT-TbtOnPch-Asus-Z370-A-Prime-II.aml along with the three
Patches.
Note about the above: I use my Thunderbolt card for UAD Apollo devices so ICM Mode is plenty and preferable. If you have other needs then perhaps Extended Bus is what you want.
USBMap.kext Update
I've edited the USBMap to include a total of 15 ports. This should make things a little more universal for people coming here looking for a solution. It only excludes HS09 (which is paired with HS10 but actually unused as ARPT uses HS10. You cannot separate the pairs.), HS11, and HS12. The last two ports belong to a 2.0 Header that is unused.
TL;DR, you will likely be good to go with the USBMap attached. Bonus, you can survive updates that USBInjectall does not.
Don't forget to add your serial.