Hi Simon,
All is working now after doing the erase system factory-default on the switch.
I first tried enabling lldp and the AP found the switch automatically but could not login, even with the correct credentials. Not sure why, but it looks like it needed to login first as super/sp-admin. Once I defaulted the switch, the AP found it, auto joined, logged in, then changed the p/w to the admin password of the AP - which was expected from reading the doc you attached above.
Thanks for the help!