Peter
I have seen this too twice in similar scenario just like yours..
How i solved it was, did a hard reset on the AP(s), reconfigured the AP, upgraded manually to controller firmware version. Once AP was up and running on new version as standalone, connected it to controller.
this did the trick in my case.. Give this a shot...