This part got me thinking:
One difference in firmware 2.0.4 is that the software-defined Mac address has changed. I am wondering if this may have caused some trouble.
I have given it a static IP which was reserved in my router via the OLD mac address. I have a feeling that might be what caused it to get stuck trying to reconnect… I updated my airport to the NEW mac address; hopefully that fixes things…