Default [Q] having major unrooting problems.

So, I followed this guide and ended up with S-on, Locked Bootloader, and a fully functional phone. I then attempted to unroot using supersu's "full unroot" option, which worked for a temp un-root, but immediately re-rooted when rebooted. I then downloaded the Universal unroot app in hopes that it would work. I opened it, granted it SU, and let it do its thing. and I am STILL rooted. Does anyone have any ideas? I've tried manually deleting the su files in system/bin/su and system/xbin/su and system/app/superuser.apk. No luck. Please someone help me get this phone 100% unrooted. Is there any way that I can manually unroot and configure the stock kernel to NOT re-root on boot? Also, I have tried to get firewater s-off to work, but weaksauce thinks I am alreeady rooted, and the already rooted instructions for firewater fail repeatedly. I am seriously out of element at this point.