I finally got it corrected. I thought, that since the amounts changed and there was now a W-2 and no 1099, I needed to amend the State return to get the new data into the State portion. I didn't. I went through it again and made sure I didn't amend the State return when asked, but all the corrected data was still entered. The forms all looked identical to the first way that I did it, except there was no X showing this as an amended return. I finally got there.
Thanks!
