If you have updated to 3.1.x then yes, there is no unlock.
However, what I can't understand is why you can't manage to jailbreak/hacktivate your iPhone so you can confirm the baseband version.
Try to get a custom ipsw made with pwnagetool on the mac that has hactivation enabled and baseband update disabled. Shift-click and restore with this.
At worst, this will give you a glorified iPod touch until an unlock arrives for the latest baseband.