Hi,
Thanks a lot for this post, luckily I saw it before I installed the vodafone update today.
Have followed the instructions (which were surprisingly easy!) and now running 2.2
As you said took me about an hour all up with reconfiguration/backups etc.