XPS 13 9360 Won't Wake from Keyboard

Hi guys

I would like to be able to wake my laptop from sleep using a mouse or keyboard, however it doesn't seem to work. 

I have disabled connected standby in regedit as it kept my bluetooth devices connected, which ran down my mouse and headphone batteries. 

I have disabled USB selective suspend in the power options

I have looked in device manager and unchecked every 'allow the computer to turn off this device to save power' option that might have anything to do with USB, keyboard, or mouse. 

I have used the powercfg tool in command prompt to enable any wake_programmable device, and this is the list: 

• Killer Wireless-n/a/ac 1535 Wireless Network Adapter
  HID-compliant vendor-defined device (003)
  Thunderbolt(TM) Controller - 1575
  HID-compliant consumer control device (003)
  HID-compliant system controller (002)
  HID Keyboard Device (004)

I'm unsure what the next step could be, I've tried waking it with multiple mouses and keyboards, to no avail.

It looks like the laptop is still turning off the devices during sleep, as the LEDs shut off, and I have already enabled the charge over USB during sleep option in BIOS. 

It enters sleep state S3, which may be the cause, but these are all the wake_from_s3_supported devices from the powercfg tool:

• PCI-to-PCI Bridge
  USB Root Hub (USB 3.0)
  Mobile 6th/7th Generation Intel(R) Processor Family I/O PCI Express Root Port #1 - 9D10
  Intel(R) Display Audio
  Detection Verification
  Generic USB Hub
  USB Input Device (002)
  Killer Wireless-n/a/ac 1535 Wireless Network Adapter
  Mobile 6th/7th Generation Intel(R) Processor Family I/O PCI Express Root Port #6 - 9D15
  HID-compliant vendor-defined device (002)
  Microsoft Input Configuration Device
  HID-compliant touch pad
  PCI-to-PCI Bridge (001)
  Intel(R) USB 3.1 eXtensible Host Controller - 1.10 (Microsoft)
  HID-compliant mouse (002)
  HID-compliant vendor-defined device (003)
  ACPI Lid
  USB Input Device (005)
  PCI-to-PCI Bridge (002)
  PCI-to-PCI Bridge (003)
  PCI-to-PCI Bridge (004)
  Generic SuperSpeed USB Hub
  USB Composite Device (002)
  Realtek Audio
  Mobile 6th/7th Generation Intel(R) Processor Family I/O PCI Express Root Port #5 - 9D14
  Intel(R) Smart Sound Technology (Intel(R) SST) Audio Controller
  USB Input Device (007)
  PCI-to-PCI Bridge (005)
  Realtek PCIE CardReader
  Thunderbolt(TM) Controller - 1575
  HID-compliant consumer control device (003)
  HID-compliant system controller (002)
  HID Keyboard Device (004)
  PCI-to-PCI Bridge (006)
  I2C HID Device
  Intel(R) Smart Sound Technology (Intel(R) SST) OED

As you can see, all the wake_armed devices are S3 wake supported. 

Interestingly, I usually have the keyboard connected through an eGPU dock, which makes it show in the powercfg wake_armed and wake_programmable options. Yet when connected directly to the laptop via a USB port it will not show. 

I've run out of ideas, is there anything else I can try?

Thank you so much for your help