I finally got around to doing a Factory Reset after getting ICS. This seems to have fixed all of my issues since the update, including poor battery life and lagginess. If anyone is still having issues, try it. I used My Backup to backup SMS and some other settings, and it did the job.