Cannot remap X/Y Axis (TM 16000M/X-55)

I have a Thrustmaster 16000M stick and a Saitek X-55 Throttle. Both devices are recognized by the game and when flying, it detects all axis and assigned button inputs.

Currently, Yaw is set to the X-axis on the stick, Pitch is set to the Y-axis and Roll is set to the Z-axis.

I'm trying to reverser Yaw and Roll so that Roll is on the X-axis and Yaw is on the Z-axis.

When I go into the mappings for the joystick, it detects the Z-axis and allows me to map Yaw to it.

When I try to map the X-axis to Roll, it does not detect the axis input and will not continue/let me remap it. I tried pitch/Y-axis to see, and those aren't being detected either in the remap screen. If I reset to default, they all work fine when flying.

Any suggestions or help? Is there a way to edit a config file manually to map it? Is there something I need to change to get the game to detect the X/Y axis in the remap popup?