We had a way harder option in the beginning: When the sword(s) touch anything, then the rotation in the direction of the collision was disabled. But it was no fun at all and very frustating to get stuck :PP.
At the end we decided to revert back to the janky movement and made it impossible to fly out of bounds (you may jump around a little bit but at the end you always land in a playable place :D). Nonetheless it can get crazy at times, you are completly right! :DD
Thanks for the feedback!! :D