Glad to hear you got it working - I was hoping for a good resolution to this.
I would just leave the lockswitch as is. At least you can lock it with a tool, maybe the stylus.