Do not upgrade until the Dev-Team comes out with tools designed to do so without ruining your chances for a future unlock. If you upgrade to 3.1, you will be unable to downgrade to 3.0, jailbreak (for now), and your baseband will be permanently locked to AT&T.