How about making the orientation-lock-toggle to on/off instead of on/lock-potrait/lock-landscape? If the phone is at landscape and orientation-lock change to off, it will automatically lock at landscape. Same goes for portrait.