@dubliner, claustn: That is the current situation we face, right. I jumped on the CM13 train as i wanted stable bluetooth.
Can't really answer the question if OTA works but if you use Multirom you can easily give it a shot by turning of device lock,
you cant upgrade to 2.1.0.11 it bricks cause :/