If you don't want the keypad locking, why would you change the controller? I don't understand what benefit the X controller might offer over the D21 one? Electrically, both bikes use the same torque sensor and the same display, similar seat-post batteries, just different motors. I'm just curious.