New build. Changes are sync with CM source (latest android security updates come with that) and the phone no longer suffers from amnesia, it now correctly identifies itself.
http://www.mediafire.com/download/5v5z6qkh7dm3f9o/cm-13.0-20160711-UNOFFICIAL-x5.zip
I also found that putting the phone into airplane mode, even briefly, kills off the NFC battery drain.
Reminder: If an app has an issue I need a logcat. If the phone locks or reboots I need a /proc/last_kmsg. NFC is still wonky and needs people willing to toy with build.prop, libnfc-bcrm.conf, and libnfc-nxp.conf.