Pin to set lock screen?
I'm assuming you've resolved by this point, but for anyone else that comes across this issue:

I just ran into the same issue.  I managed to resolve it by going to https://www.google.com/android/devicemanager and used the lock option to set a different password.  Then I was able to go into lock screen settings and change to pin/pattern/ect as normal.