Ok, for real - it can't be this hard to upgrade.....

I know that I'm probably becoming a pain in everyone's ***, but not one erson has answered any of my posts.

1) I upgraded wife's 3G to 3.0 perfectly fine. From 2.2.1.
2) CANNOT upgrade my 3G to 3.0, FROM 3.0Beta5. I keep clicking the "Restore" button, as was suggested here, and it gives me an error about the resources not being there. HOWEVER, I already downloaded the update for my wife's 3G.
3) i WOULD install the 3.0 Beta Gold Master, but I heard somewhere that the betas EXPIRE, so I dont want to do that if I'll still be stuck sometime soon in the same position, once the GM expires.