Thanks. I did the factory reset, and everything seemed fine. The only problem was all my Google apps forced closed on me, so I went into recovery to install gapps myself, and when I rebooted it threw me into another infinite boot loop. Thankfully I had a nandroid I could restore.