Vodaphone are nothing but cheating greedy vultures and need to be treated with the contempt they deserve.
If anyone is silly enough to even put up with the antics of voda then they cannot be helped but it IS fact that the warranty will always be there from NOKIA no matter what Vodaphone say and do.
Ditch Vodaphone as soon as is possible and don't be scared to flash manually an update.