Kernel upgrade didn't do it, but I think it was still loading the wrong devices. I took these out of /etc/modules, found time to let it finish an upgrade (80Mb of updates a week after 137Mb of updates :-/ ...). Then there was a small iwconfig setting, and it all worked!
I got as far as upgrading the kernel - and you mentioned that it was still loading the wrong devices. I need some guidance as to what modules you took out of etc/modules - and - something about finishing an upgrade.