Unlocked, I already had a backup of the TA partition, installed the FOTAKernel, rebooted, restored my Google settings, etc, did the upgrade, and...
It worked like a charm. Even booted up in fastboot an older kernel as suggested in an earlier post and installed SU.
Camera seems to be working...