I decided I'm just restoring and setting up as new. I haven't ever set up my iPhone as new since I got my original iPhone, so it might be time. I'll be using iBackupBot to transfer my messages, message attachments, camera roll, and contacts to the "new" phone.