I haven't quite finished the active mode interactions (basically as you noted there are too many actions that still automatically switch you to passive mode. Also, the radial menu is in progress still. Once these things are more finalized I will post here and we can check that everything is working properly.
Thanks!