I have never had to perform a master reset due to incorrect lock codes. If you enter the lock code incorrectly more than five times, there is an option that appears that will allow you to unlock your phone with the Google credentials you used to set up your phone.

Once you have done that, try making your lock code a password instead and then enter it that way. Then remove the password lock code and see if this fixes your problem.

BTW, are you rooted? If you are rooted, there may be something else going on that is causing this issue.

Kratos