I have been thinking to take the same path as you, maybe not the same phone, but definitely moving out of Samsung, the Samsung-TMobile combo has me frustrated in terms of software and bloatware (adding the SD card and battery bs, which btw, the battery doesnt bother me as much as the SD Card)...