I'll play guinea pig. Since I couldn't get iTunes to recognize my original library, I created a new library with all my music from the previous library. The previous library still exists, so I'll sync my iPhone to that library first. I'll then do the new sync to the new library. If things get fubared, I'll still have a fallback.