in exactly the same predicament as you since day1.
however i think the screwup (for whatever reasons) is on xm side, rather than yeelight. xm could have consolidated all servers instead of having 101 different servers. are they going to unscrew this situation? i think it was mentioned before it's work-in-progress but i don't hold out much hope considering xm is pretty bad on the software side. but can always hope.
so yeah, my xm/yeelight ecosystem is screwed as royally as yours so long there exists separate servers that have different catalogue on limited/different devices that you can add, and alexa that only works in selected server.