I was able to update it (turned off wifi during the waiting part) so now my phone is on 3.0 yet when I try to restore it gives me the "iphone activation server is temporarily unavailable" message.
I'll try it later tonight when it should be less traffic.