Just a final update.
Works at my job no problem.
Works at home with new router, but with a few issues. If I fire up and try to connect with my SSID, it doesn't connect on the first try. If I uncheck the option to manually enter SSID, it will sometimes connect. If it doesn't, I can sometimes RECHECK it (this must be done), reenter SSID, and then it connects. It's like it has to be reinitialized or something. Weird.