So, this method worked. I got latest OTA, CWM installed, and flashed a ROM.
Oops, the ROM I flashed has no working wifi. Probably other stuff broken too. Too bad the ROM thread didn't mention this (just a bunch of people one-lining things like "this rocks" "best ROM evar" that sort of thing). So, I forgot to back up after getting CWM installed and now I'm stuck.
Question is, though, is my wifi borked because I'm S-ON Unlocked, or because of the ROM? Secondly, anyone know of this ROM available in "update.zip" form that I might flash from recovery?