i had a modified 3.1.3 through sn0wbreeze, on an old baseband. Ive heard Spirit will not count as a jailbreak when upgrading to the 4.0, also your new baseband may not help. You could certainly try. You can restore back to 3.1.3 if need be.