If anyone's curious, the solution I finally got to work was putting it in DFU mode. It was a little obnoxious having to resync all my music and everything, but at least it's all working now!
My apps, contacts and stuff were are all automatically synced when restored via DFU. how come not yours?