This fix did not completely take care of my problem, but I finally found a fix that worked. Even after doing the above I still had messed up conversation order and a red exclamation point. With some SQL updates to the database those are finally resolved.

See my post here for details