Quick update on my original post--it's been about 3 weeks since I got my replacement phone, and so far everything is going very smoothly.  I think there may have been one random reboot, but otherwise I have noticed that I can use the phone for extended periods on wi-fi or mobile network without overheating or rebooting.  I'll keep updating this thread from time to time.