Gevey works with all current basebands.
Seeing that only the first iPhone 4 baseband has been unlocked. I wouldn't hold my breath for a software unlock coming anytime soon, especially if iOS 5 is released in 3 months this summer -- JMO. I hope I'm wrong.
I would preserve the baseband, though, just incase.