I upgraded to 5.0.1 a few days ago, jailbroke and unlocked it without any problem. Here's my suggestion:
Instead of using the firmware from iTunes, you use a custom firmware that can be jailbroken and unlocked easily.
For this you use Sn0wbreeze which is capable of making a custom firmware...