Sorry, thought you were new here lol.
The
N95-2 process will be the same as your experience with the
N95-1.
You can reinstall the same firmware with a changed product code of that of a branded firmware, for example, if you wanted to return the red splash screen etc of voda firmware, just change the product code using NSS to the Vodafone specific code.
Your warranty may well be void now anyway, although there has been some reports that repairs have been carried out on debranded handsets.