I guess as long as your happy with 4.0, then 3.1.3 doesn't matter since baseband for 4.0 is unlocked (just jailbreak pending)
Make sure you grab 4.0 files though as I'm sure with the baseband unlocked, iPhone 4 will be unlocked on release and Apple will soon have an update out