Wahoo Kickr Snap Bluetooth on Android

Hi All, I have been trying to move Zwift over to my phone as my laptop slowly dies, but cannot get the final piece of he puzzle to work. I have a Wahoo Kickr Snap which can run as a bluetooth controllable device and will do so on the PC, or via my phone by connecting through the companion app. But if I try and connect with Zwift adroid, I can only connect via Ant, not bluetooth even though I can connect to other bluetooth devices (Stages, Xoss) fine in the same session. This means I am unable to use the controllable features of the Snap because zwift adroid does not support FE-C yet. Connections are as follows:

Zwift on PC with inbuilt bluetooth and Ant enabled:
Snap bluetooth as power meter
Snap Ant as power meter
Snap Ant as controllable trainer

Zwift on PC with companion app bluetooth on Samsung S20 and inbuilt Ant enabled:
Snap bluetooth as power meter
Snap Ant as power meter
Snap Ant as controllable trainer
Snap bluetooth as controllable trainer

Zwift on Samsung S20:
Snap Ant as power meter
No snap bluetooth seen but other devices are picked up by bluetooth in the same session

All firmware is up to date

I have also sent a ticket to Zwift and Wahoo but wanted to check if anyone had anything similar here too