MSI Claw 8 AI+ (Intel Ultra 7 258V) built in controller/buttons issues

Hi I installed CachyOS-Handheld edition the other day on my Claw. I have pin code entry setup on wake from sleep and boot. I'm seeing the face buttons/controls all work as expected on boot. But on wake from sleep most of the controller buttons are not functioning. I can get past the pin code screen via the touch screen however at that point the machine is treating the right joystick as a mouse. X and A buttons work. Nothing else is registered. Does a way exist to force the machine back to using the all of the face buttons etc? Machine is on 6.16.5.2-cachyos-deckify.

The physical volume buttons don't work at all either

Restarting the machine it's fine again. I haven't installed hand held daemon which is something I might try as I saw something saying input plumber and HHD don't coexist well and input plumber is CachyOSs preferred package for interfacing to windows handheld controller components.