Thanks for all the suggestions.
rf-domain does have "channel-list 5GHz 36,40,44,48,149,153,157,161"
The system has been operating since early 2014, so the 6522 was the best fit at that time, and the roaming issue may or may not have been present since the beginning, but only now the application is affected.