I used this guy, I've debranded twice, and rebranded my phones when I had to send them in for warranty repair. They also have a new PIMP program which will let you selectively control phone features that may have been changed by the carrier from the mfgr default, e.g, no ability to turn off the 3G network search (a battery drainer in non-3G areas) :

davinciteam.com