I hear you, i'm in the same boat.
My plan for the time being is to have an isolated section of the layout to just shunt about on, using an hm6000 for power and control. Seems the least drastic compromise. A select and dongle sort of defeats the point of the simplicity of app control, although it is appealing.
I live in hope that the 6 pins will be available long before September ‘25!