Which upgrade is good for 3gs with ios 4.0.1

Which upgrade is good for 3gs with ios 4.0.1; it has been jailbroken and unlocked currently. I want to retain all data and Apps as is. Also let me know detail instructions. Thank you