I re-flashed both but the Nokia email didn't differentiate. Here is part of their email:

"Based on your concern, we regret to inform you that since you have flashed your N900, this voids your warranty priviledges. It is repairable but unfrotunately fees would be applied. If you decide to go through with the repair, you would need to go to your nearest NCP (Nokia Care Point) for further instructions."

This email was sent in response to my email about the SIM card becoming unrecognized after I flashed my phone to try to fix the problem with the phone being unresponsive upon wake-up or during incoming phone calls or alarms. As I said in my earlier email, I was able to get the SIM card working again but I still have the screen freezing problem.
-- Don