The version I have running (prior to my own changes) is indeed the latest version I could find on Harrald's site. As I discussed, the things that needed to be swapped are being swapped only by accident, and Harrald's patch basically unswaps all the things that shouldn't have been in the first place.
I don't know what's in the "unreleased" patch, not having seen it. If it addresses these concerns, fine, I've only wasted two days. Otherwise, I am willing to put in the time to debug and polish the code, especially since it is becoming a model for other wireless drivers. Once I have it working as well for me as Harrald's version works, I would offer it as a patch to pcmcia-cs-3.1.19 for others to try before submitting any changes to the codebase.
I certainly don't wish to trample on anyone's toes, and I have the utmost admiration for those who have made these devices work at all. I just think it can/should be made more straightforward and understandable.