Mine S2 wasn't working when I finally activated it (unlock) after I upgraded the watch to OS4. It started working randomly after about a day or two and works flawlessly now.
If so, try rebooting your watch. I had the same issue, the mac would say "unlocking with watch" and then revert back to password. It was resolved when I upgraded my watch to wOS4.1 and the watch rebooted.